修改城燃管道bug

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/InstallNoticeMapper.xml

@@ -33,7 +33,7 @@
             <if test="constructionUnit != '' and constructionUnit != null">
                 and a.construction_unit LIKE concat("%",#{constructionUnit},"%")
             </if>
-            <if test="ids != null" >
+            <if test="ids != null and ids.size > 0 " >
                 and a.project_id in
                 <foreach collection="ids" item = "item" index="index" open="(" separator="," close=")">
                     #{item}

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectResourceController.java

@@ -293,7 +293,7 @@ public class ProjectResourceController extends BaseController {
     @ApiOperation(httpMethod = "get",value = "根据当前登录人获取登录人参与的项目列表",  notes = "根据当前登录人获取登录人参与的项目列表")
     public ResponseModel<List<Project>> selectByUserId(){
         List<Project> projectList = projectResourceServiceImpl.getProjectList();
-        projectList = projectList.stream().filter(r -> r.getStatus().equals(ProjectInitiationEnum.流程结束.getName())).collect(Collectors.toList());
+        projectList = projectList.stream().filter(r -> ProjectInitiationEnum.流程结束.getName().equals(r.getStatus())).collect(Collectors.toList());
         return ResponseHelper.buildResponse(projectList);
     }
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeServiceImpl.java

@@ -71,6 +71,11 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
             String id = String.valueOf(project.getSequenceNbr());
             ids.add(id);
         }
+
+        if(ValidationUtil.isEmpty(ids)){
+            return page;
+        }
+
         Page<InstallNoticePageDto> installNoticePage = installNoticeMapper.installNoticePage(page,name,constructionUnit,ids);
         List<InstallNoticePageDto> installNoticePageDtos = installNoticePage.getRecords();
         for(InstallNoticePageDto installNoticePageDto:installNoticePageDtos){

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -80,7 +80,9 @@ public class OrgServiceImpl {
             dynamicFormInstance.setFormColumnId(dynamicFormColumn.getSequenceNbr());
             //通过字段名去拿到表单传来的值
             if("image".equals(dynamicFormColumn.getFieldCode())){
+                if(!ValidationUtil.isEmpty(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode()))){
                     dynamicFormInstance.setFieldValue(JSON.toJSONString(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode())));
+                }
             }else{
                 dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
             }
@@ -270,7 +272,7 @@ public class OrgServiceImpl {
         map.put("sequenceNbr",sequenceNbr);
         for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
             if("image".equals(dynamicFormInstance.getFieldCode())){
-                if(!ValidationUtil.isEmpty(dynamicFormInstance.getFieldValue())){
+                if(!ValidationUtil.isEmpty(dynamicFormInstance.getFieldValue()) || !"null".equals(dynamicFormInstance.getFieldValue())){
                     map.put(dynamicFormInstance.getFieldCode(),JSON.parseArray(dynamicFormInstance.getFieldValue()));
                 }
             } else {