职工、部门附件单独权限设置

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -109,6 +109,31 @@ public class SysDeptController extends BaseController
         dept.setUpdateBy(getUsername());
         return toAjax(deptService.updateDept(dept));
     }
+    /**
+     * 修改部门附件专用接口
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/editDocs")
+    public AjaxResult editDocs(@Validated @RequestBody SysDept dept)
+    {
+        /*Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (!deptService.checkDeptNameUnique(dept))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        else if (dept.getParentId().equals(deptId))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
+        {
+            return error("该部门包含未停用的子部门！");
+        }*/
+        dept.setUpdateBy(getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
 
     /**
      * 删除部门

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhEmployeeController.java

@@ -112,7 +112,17 @@ public class KhEmployeeController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody KhEmployee khEmployee)
     {
-        return toAjax(khEmployeeService.updateKhEmployee(khEmployee));
+        return khEmployeeService.updateKhEmployee(khEmployee);
+    }
+    /**
+     * 修改职工附件专用接口
+     */
+    @PreAuthorize("@ss.hasPermi('kaohe:employee:docs')")
+    @Log(title = "职工信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/editDocs")
+    public AjaxResult editDocs(@RequestBody KhEmployee khEmployee)
+    {
+        return khEmployeeService.updateKhEmployeeDocs(khEmployee);
     }
 
     /**

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhEmployeeService.java

@@ -43,7 +43,7 @@ public interface IKhEmployeeService
      * @param khEmployee 职工信息
      * @return 结果
      */
-    public int updateKhEmployee(KhEmployee khEmployee);
+    public AjaxResult updateKhEmployee(KhEmployee khEmployee);
 
     /**
      * 批量删除职工信息
@@ -62,4 +62,6 @@ public interface IKhEmployeeService
     public int deleteKhEmployeeById(Long id);
 
     String importEmp(List<KhEmployee> empList, boolean updateSupport, String operName);
+
+    AjaxResult updateKhEmployeeDocs(KhEmployee khEmployee);
 }

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java

@@ -90,7 +90,7 @@ public class KhEmployeeServiceImpl implements IKhEmployeeService {
                 user.setNickName(khEmployee.getEmpName());
                 user.setPassword(SecurityUtils.encryptPassword("111111"));
                 user.setDeptId(khEmployee.getDeptId());
-                Long[] roleIds = {102L};  //固定的评分账号角色id
+                Long[] roleIds = {102L};  //固定的职工账号角色id
                 user.setRoleIds(roleIds);
                 userService.insertUser(user);
             }
@@ -108,9 +108,40 @@ public class KhEmployeeServiceImpl implements IKhEmployeeService {
      * @return 结果
      */
     @Override
-    public int updateKhEmployee(KhEmployee khEmployee) {
+    public AjaxResult updateKhEmployee(KhEmployee khEmployee) {
+        //如果修改了工号，验证工号不能已存在其他职工上面
+        KhEmployee param = new KhEmployee();
+        param.setWordId(khEmployee.getWordId());
+        List<KhEmployee> e = khEmployeeMapper.selectKhEmployeeList(param);
+        if (e!=null&& e.size() == 1) {
+            if(e.get(0).getId()!=khEmployee.getId()){
+                return AjaxResult.error("修改失败，工号已存在！");
+            }else{//没有修改员工工号  则直接修改
+                return khEmployeeMapper.updateKhEmployee(khEmployee)>0 ? AjaxResult.success() : AjaxResult.error();
+            }
+        }else{ //给当前员工，修改了一个新的工号
             khEmployee.setUpdateTime(DateUtils.getNowDate());
-        return khEmployeeMapper.updateKhEmployee(khEmployee);
+            int r =khEmployeeMapper.updateKhEmployee(khEmployee);
+            ///生成对应的用户账号，工号为账号
+            SysUser user= new SysUser();
+            user.setUserName(khEmployee.getWordId());
+            if (userService.checkUserNameUnique(user))
+            {
+                user.setCreateBy(getUsername());
+                user.setNickName(khEmployee.getEmpName());
+                user.setPassword(SecurityUtils.encryptPassword("111111"));
+                user.setDeptId(khEmployee.getDeptId());
+                Long[] roleIds = {102L};  //固定的职工账号角色id
+                user.setRoleIds(roleIds);
+                userService.insertUser(user);
+            }
+            return r>0 ? AjaxResult.success() : AjaxResult.error();
+        }
+    }
+
+    @Override
+    public AjaxResult updateKhEmployeeDocs(KhEmployee khEmployee) {
+        return khEmployeeMapper.updateKhEmployee(khEmployee)>0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**