修改预警设置中的两个问题

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarningServiceImpl.java

@@ -136,9 +136,13 @@ public class WarningServiceImpl implements WarningService{
 			warSettingIdObj.set("personnel", personnelStr);
 		}
 		String min = warnSetting.getMin();
+		if(min != null) {
 			warSettingIdObj.set("min", min);
+		}
 		String max = warnSetting.getMax();
+		if(max != null) {
 			warSettingIdObj.set("max", max);
+		}
 		warnSettingDao.update(warSettingIdObj);
 	}
 

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

@@ -303,8 +303,8 @@ public class ContractServiceImpl implements ContractService {
 		KObject contract = contractDao.load(UUID.fromString(billId));
 		Map<String, Object> map = new HashMap<>();
 		map.put("contractName", contract.getString("contractName"));
-		map.put("purchaseSandUnitName", contract.getString("purchaseSandUnitName"));
-		map.put("project", contract.isNull("project") ? "" : contract.get("project").getString("projectName"));
+		map.put("purchaseSandUnitName", contract.get("purchaseSandUnit").getString("name"));
+		map.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("projectName"));
 		map.put("personnel", warnSetting.getString("personnel"));
 		map.put("max", warnSetting.getString("max"));
 		map.put("min", warnSetting.getString("min"));