修改代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -602,6 +602,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         }
         Date  startDate1 = new Date();;
         int dangerListSize = latentDangerMapper.countByBathBusinessKeys(bussinessKeys, latentDangerListParam);
+        if (latentDangerListParam.getBelongType().equals(1)){
+            latentDangerListParam.setUserId(user.getUserId());
+        }
         List<LatentDangerBo> dangerList = latentDangerMapper.getByBathBusinessKeys(bussinessKeys, latentDangerListParam);
         Date  endDate1 = new Date();
         logger.info("-------------------------sql时间" +(endDate1.getTime()-startDate1.getTime()));
@@ -1269,9 +1272,12 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 latentDangerBo.setReformType(LatentDangerReformTypeEnum.常规整改.getCode().toString());
                 JSONObject reformJsonObj = JSONObject.parseObject(latentDangerBo.getReformJson());
                 if (ValidationUtil.isEmpty(reformJsonObj)) {
-                    reformJsonObj = executeParam.getFlowJson();
+               //     reformJsonObj = executeParam.getFlowJson();
+                    reformJsonObj.put("governPhotoObj",executeParam.getFlowJson().get("photoUrls"));
+
                 } else {
-                    reformJsonObj.putAll(executeParam.getFlowJson());
+             //       reformJsonObj.putAll(executeParam.getFlowJson());
+                    reformJsonObj.put("governPhotoObj",executeParam.getFlowJson().get("photoUrls"));
                 }
                 latentDangerBo.setReformJson(reformJsonObj.toJSONString());
                 latentDangerBo.setInferOtherThings(executeParam.getInferOtherThings());
@@ -1295,6 +1301,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                     reformJsonObject = new JSONObject();
                 }
                 reformJsonObject.put("governUserId", governUserId);
+                reformJsonObject.put("reviewPhotoObj",reformJsonObject.get("photoUrls"));
                 latentDangerBo.setReformJson(reformJsonObject.toJSONString());
 
                 // 消防巡查需求:评审通过后指定治理人