fte修改

fhKeeper/formulahousekeeper/management-crm/pom.xml

@@ -79,6 +79,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
+            <version>2.0.39</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.dingtalk</groupId>-->

fhKeeper/formulahousekeeper/management-crm/src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.94.62.58:17089/man_crm?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
+    url: jdbc:mysql://1.94.62.58:17089/man_crm_bk?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
     password: P011430@Huoshi*
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1880,15 +1880,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         projectSeparate.setId(id);
                         projectSeparateMapper.insert(projectSeparate);
                     }else if (companyId==Constant.MLD_COMPANY_ID){
-                        ArrayList<ProjectLeader> leaderArrayList = new ArrayList<>();
-                        for (String leaderId : leaderIds) {
-                            ProjectLeader leader = new ProjectLeader();
-                            leader.setProjectId(project.getId());
-                            leader.setLeaderId(leaderId);
-                            leader.setCompanyId(companyId);
-                            leaderArrayList.add(leader);
+                        if (leaderIds!=null&&leaderIds.length>0) {
+                            ArrayList<ProjectLeader> leaderArrayList = new ArrayList<>();
+                            for (String leaderId : leaderIds) {
+                                ProjectLeader leader = new ProjectLeader();
+                                leader.setProjectId(project.getId());
+                                leader.setLeaderId(leaderId);
+                                leader.setCompanyId(companyId);
+                                leaderArrayList.add(leader);
+                            }
+                            projectLeaderService.saveBatch(leaderArrayList);
                         }
-                        projectLeaderService.saveBatch(leaderArrayList);
                     }
                     OperationRecord operationRecord=new OperationRecord();
                     operationRecord.setProjectName(project.getProjectName());
@@ -2161,15 +2163,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     }
                 }else if (companyId==Constant.MLD_COMPANY_ID){
                     projectLeaderService.remove(new QueryWrapper<ProjectLeader>().eq("project_id",p.getId()));
-                    ArrayList<ProjectLeader> leaderArrayList = new ArrayList<>();
-                    for (String leaderId : leaderIds) {
-                        ProjectLeader leader = new ProjectLeader();
-                        leader.setProjectId(p.getId());
-                        leader.setLeaderId(leaderId);
-                        leader.setCompanyId(companyId);
-                        leaderArrayList.add(leader);
-                    }
-                    projectLeaderService.saveBatch(leaderArrayList);
+                    if (leaderIds!=null&&leaderIds.length>0) {
+                        ArrayList<ProjectLeader> leaderArrayList = new ArrayList<>();
+                        for (String leaderId : leaderIds) {
+                            ProjectLeader leader = new ProjectLeader();
+                            leader.setProjectId(p.getId());
+                            leader.setLeaderId(leaderId);
+                            leader.setCompanyId(companyId);
+                            leaderArrayList.add(leader);
+                        }
+                        projectLeaderService.saveBatch(leaderArrayList);
+                    }
                 }
                 operationRecord.setContent(content);
                 //operationRecord.setModuleName("项目管理");