去掉BU审核模式下的项目负责人检查

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

@@ -1631,13 +1631,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }).collect(Collectors.toList());
                 collect.add(-1);
                 List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().in("department_id", collect));
-                Optional<Project> first = projectList.stream().filter(p -> StringUtils.isEmpty(p.getInchargerId())).findFirst();
-                if (first.isPresent()) {
-                    String projectName = first.get().getProjectName();
-                    //httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
-                    httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
-                    return httpRespMsg;
-                }
+//                Optional<Project> first = projectList.stream().filter(p -> StringUtils.isEmpty(p.getInchargerId())).findFirst();
+//                if (first.isPresent()) {
+//                    String projectName = first.get().getProjectName();
+//                    //httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
+//                    httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
+//                    return httpRespMsg;
+//                }
                 for (Report r : reportList) {
                     //根据项目阶段来调整审核流程
                     /*任务所属项目*/
@@ -2698,13 +2698,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }).collect(Collectors.toList());
                 collect.add(-1);
                 List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().in("department_id", collect));
-                Optional<Project> first = projectList.stream().filter(p -> StringUtils.isEmpty(p.getInchargerId())).findFirst();
-                if (first.isPresent()) {
-                    String projectName = first.get().getProjectName();
-                    //httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
-                    httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
-                    return httpRespMsg;
-                }
+//                Optional<Project> first = projectList.stream().filter(p -> StringUtils.isEmpty(p.getInchargerId())).findFirst();
+//                if (first.isPresent()) {
+//                    String projectName = first.get().getProjectName();
+//                    //httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
+//                    httpRespMsg.setError("请给["+projectName+"]项目设置项目负责人");
+//                    return httpRespMsg;
+//                }
                 for (Report r : reportList) {
                     //根据项目阶段来调整审核流程
                     /*任务所属项目*/
@@ -2753,10 +2753,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 r.setAuditDeptManagerid(department.get().getManagerId());
                                 r.setIsDeptAudit(1);
                                 r.setAuditDeptid(department.get().getDepartmentId());
-                                if(department.get().getManagerId().equals(r.getProjectAuditorId())){
-                                    r.setState(1);
-                                    r.setDepartmentAuditState(1);
-                                }
+                                r.setState(1);
+                                r.setDepartmentAuditState(1);
                             }else r.setState(1);
                         }
                     }

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

@@ -2112,7 +2112,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
         HttpRespMsg msg = new HttpRespMsg();
         handoverId = userMapper.selectById(handoverId).getCorpwxUserid();
         takeoverId = userMapper.selectById(takeoverId).getCorpwxUserid();
-        msg.setError("转移失败!");
+
         String providerAccessToken = getProviderAccessToken();
         String url ="https://qyapi.weixin.qq.com/cgi-bin/license/batch_transfer_license?provider_access_token=" + providerAccessToken;
         User user = userMapper.selectById(request.getHeader("token"));
@@ -2139,6 +2139,8 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
             System.out.println(resp);
             if (respJson.getInteger("errcode")==0){
                 msg.msg = "转移成功";
+            } else {
+                msg.setError("转移失败："+respJson.toJSONString());
             }
         }
         return msg;