crm同步人员bug修复。

工时离职人员检查日报逻辑修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -2302,50 +2302,51 @@ public class WeiXinCorpController {
                         curDept = department;
                     } else {
                         //
-                        System.out.println("找到了已有部门== name=="+curDept.getDepartmentName());
+                        System.out.println("找到了已有部门== name==" + curDept.getDepartmentName());
                         if (parentId == 1) {
                             if (curDept.getSuperiorId() != null) {
                                 //变更到一级部门了,此处不依赖于其他部门是否存在，可以直接更新
                                 departmentMapper.updateNullSuperior(curDept.getDepartmentId());
                             }
                         } else {
-                            if (curDept.getCorpwxDeptpid() == null||curDept.getCorpwxDeptpid()!=parentId) {
+                            if (curDept.getCorpwxDeptpid() == null || curDept.getCorpwxDeptpid() != parentId) {
                                 //有父部门需要更新
                                 curDept.setCorpwxDeptpid(parentId);
                                 departmentMapper.updateById(curDept);
                             }
                         }
                     }
-                    //获取部门下的人员
-                    JSONArray userList = getDeptUserSimple(curCorpAccessToken, deptId);
-                    for (int m=0;m<userList.size(); m++) {
-                        JSONObject userJson = userList.getJSONObject(m);
-                        String curUserid = userJson.getString("userid");
-                        String openUserid = userJson.getString("open_userid");
-                        System.out.println("人员信息："+userJson.toString());
-                        //不存在的人员， 进行插入
-                        User user = new User();
-                        Optional<User> first = allCorpWxUserList.stream().filter(all -> all.getCorpwxUserid().equals(openUserid)).findFirst();
-                        if (first.isPresent()) {
-                            user = first.get();
-                            user.setCorpwxDeptid(deptId);
-                        } else {
-                            //在当前部门下的员工
-                            user.setId(SnowFlake.nextId()+"")
-                                    .setRoleId(defaultRole.getId())//默认普通员工
-                                    .setRoleName(defaultRole.getRolename())
-                                    .setCompanyId(companyId)
-                                    .setName(userJson.getString("name"))
-                                    .setCorpwxUserid(openUserid)
-                                    .setCorpwxRealUserid(curUserid)
-                                    .setColor(ColorUtil.randomColor())
-                                    .setJobNumber(openUserid.equals(curUserid)?null:curUserid)
-                                    .setPassword(MD5Util.getPassword("000000"))
-                                    .setCorpwxDeptid(curDept.getCorpwxDeptid());
-                            allCorpWxUserList.add(user);
-                        }
+                }
+                //获取部门下的人员
+                JSONArray userList = getDeptUserSimple(curCorpAccessToken, deptId);
+                for (int m=0;m<userList.size(); m++) {
+                    JSONObject userJson = userList.getJSONObject(m);
+                    String curUserid = userJson.getString("userid");
+                    String openUserid = userJson.getString("open_userid");
+                    System.out.println("人员信息："+userJson.toString());
+                    //不存在的人员， 进行插入
+                    User user = new User();
+                    Optional<User> first = allCorpWxUserList.stream().filter(all -> all.getCorpwxUserid().equals(openUserid)).findFirst();
+                    if (first.isPresent()) {
+                        user = first.get();
+                        user.setCorpwxDeptid(deptId);
+                    } else {
+                        //在当前部门下的员工
+                        user.setId(SnowFlake.nextId()+"")
+                                .setRoleId(defaultRole.getId())//默认普通员工
+                                .setRoleName(defaultRole.getRolename())
+                                .setCompanyId(companyId)
+                                .setName(userJson.getString("name"))
+                                .setCorpwxUserid(openUserid)
+                                .setCorpwxRealUserid(curUserid)
+                                .setColor(ColorUtil.randomColor())
+                                .setJobNumber(openUserid.equals(curUserid)?null:curUserid)
+                                .setPassword(MD5Util.getPassword("000000"))
+                                .setCorpwxDeptid(curDept == null?1:curDept.getCorpwxDeptid());
+                        allCorpWxUserList.add(user);
                     }
                 }
+
             }
             //更新部门层级关系
             updateDeptHierachyByCorpWx(companyId);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -552,7 +552,8 @@ public class TaskController {
                 msg.setError("当前任务必须要上传成果附件才可以完成");
                 return msg;
             } else {
-                cnt = taskFilesMapper.selectCount(new QueryWrapper<TaskFiles>().eq("task_id",task.getId()).eq("final_charge_status",0));
+                cnt = taskFilesMapper.selectCount(new QueryWrapper<TaskFiles>().eq("task_id",task.getId())
+                        .eq("final_charge_status",0).ne("charge_one_status",2).ne("charge_two_status",2));
                 if (cnt > 0) {
                     msg.setError("当前任务存在尚未审核通过的成果附件，不可完成");
                     return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -770,7 +770,7 @@ public class UserController {
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Report::getState,0);
         queryWrapper.eq(Report::getCompanyId,companyId);
-        queryWrapper.and(wrapper->wrapper.and(wr->wr.eq(Report::getAuditDeptManagerid,user.getId()).eq(Report::getIsDeptAudit,1)).or(wr1->wr1.eq(Report::getProjectAuditorId,user.getId()).eq(Report::getIsDeptAudit,0)));
+        queryWrapper.and(wrapper->wrapper.and(wr->wr.eq(Report::getAuditDeptManagerid,user.getId()).eq(Report::getIsDeptAudit,1)).or(wr1->wr1.eq(Report::getProjectAuditorId,user.getId()).eq(Report::getProjectAuditState,0)));
         Integer count = reportMapper.selectCount(queryWrapper);
         if(count>0){
             msg.setError("当前员工有担任审核人的日报，请确认处理方式？");

fhKeeper/formulahousekeeper/timesheet_deploy/copyFiles.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cp timesheet-3.4.0.jar /www/webapps/worktime/
-cp -rf static_pc/dist/* /www/staticproject/timesheet/
-cp -rf static_h5/dist/* /www/staticproject/timesheet_h5/
+\cp timesheet-3.4.0.jar /www/webapps/worktime/
+\cp -rf static_pc/dist/* /www/staticproject/timesheet/
+\cp -rf static_h5/dist/* /www/staticproject/timesheet_h5/
 echo 'all files are copied successful, if there is db script, you should run sh import_sql.sh; then you can cd /www/webapps/worktime/ and restart server with command: sh restart.sh'