Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/bean/request/ContractRequest.java

@@ -64,6 +64,16 @@ public class  ContractRequest {
      */
     private String areaManagerId;
 
+    /**
+     * 区域总监
+     */
+    private String areaDirector;
+
+    /**
+     * 区域总监ID
+     */
+    private String areaDirectorId;
+
     /**
      * 合同开始日期
      */

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectServiceImpl.java

@@ -129,6 +129,9 @@ public class ProjectServiceImpl implements ProjectService {
         }
         Page<Project> result = projectMapper.page(page, projectDto);
         List<Project> records = page.getRecords();
+        if(CollectionUtil.isEmpty(records)){
+            return result;
+        }
         Set<String> ids = convertSet(records, Project::getId);
         List<Contract> contracts = contractService.selectByProjectIds(ids);
         List<ContractApply> ContractApplys = contractApplyService.getListByProjectIds(ids);