瀏覽代碼

编辑修改,编辑机构码

yumeng 5 年之前
父節點
當前提交
eb62a7d78f

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -79,6 +79,8 @@ public class SysUserController {
     private ISysRoleService roleService;
     private ISysRoleService roleService;
     @Autowired
     @Autowired
     private IProjectMemberService memberService;
     private IProjectMemberService memberService;
+    @Autowired
+    private ISysDepartService departService;
 
 
 
 
     @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
     @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
@@ -172,7 +174,14 @@ public class SysUserController {
         String selectedRoles = jsonObject.getString("selectedroles");
         String selectedRoles = jsonObject.getString("selectedroles");
         String selectedDeparts = jsonObject.getString("selecteddeparts");
         String selectedDeparts = jsonObject.getString("selecteddeparts");
         try {
         try {
+
             SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
             SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
+            if (!Check.isNull(selectedDeparts)) {
+                SysDepart depart = departService.getById(selectedDeparts);
+                if (!Check.isNull(depart)) {
+                    user.setOrgCode(depart.getOrgCode());
+                }
+            }
             //设置创建时间
             //设置创建时间
             user.setCreateTime(new Date());
             user.setCreateTime(new Date());
             String salt = oConvertUtils.randomGen(8);
             String salt = oConvertUtils.randomGen(8);
@@ -209,6 +218,12 @@ public class SysUserController {
                 user.setPassword(sysUser.getPassword());
                 user.setPassword(sysUser.getPassword());
                 String roles = jsonObject.getString("selectedroles");
                 String roles = jsonObject.getString("selectedroles");
                 String departs = jsonObject.getString("selecteddeparts");
                 String departs = jsonObject.getString("selecteddeparts");
+                if (!Check.isNull(departs)) {
+                    SysDepart depart = departService.getById(departs);
+                    if (!Check.isNull(depart)) {
+                        user.setOrgCode(depart.getOrgCode());
+                    }
+                }
                 sysUserService.editUserWithRole(user, roles);
                 sysUserService.editUserWithRole(user, roles);
                 sysUserService.editUserWithDepart(user, departs);
                 sysUserService.editUserWithDepart(user, departs);
                 userCompanyService.addOrUpdateUserWithCompany(user);
                 userCompanyService.addOrUpdateUserWithCompany(user);