Browse Source

修改 用户信息

zhuwei 2 years ago
parent
commit
7887422998

+ 0 - 5
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -164,9 +164,4 @@ public class User extends TenantEntity {
     @ApiModelProperty(value = "日单价")
     private Double oneMoney;
 
-    /**
-     * 职位
-     */
-    @ApiModelProperty(value = "机构信息")
-    private String deptInfo;
 }

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -289,7 +289,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
                 if (eType.equals("bigint") && (eLength > 255 || eLength < 10)) {
                     throw new ServiceException("请输入正确长度,该类型范围为10-255之间");
-                } else if (eType.equals("varchar") && (eLength > 1000 || eLength < 10)) {
+                } else if (eType.equals("varchar") && (eLength > 2000 || eLength < 10)) {
                     throw new ServiceException("请输入正确长度,该类型范围为10-1000之间");
                 } else if (eType.equals("decimal") && (eLength > 65 || eLength < 10)) {
                     throw new ServiceException("请输入正确长度,该类型范围为10-65之间");

+ 15 - 0
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -195,4 +195,19 @@ public class DeptController extends BladeController {
     }
 
 
+    /**
+     * 获取部门用户tree (内控系统特有)
+     *
+     * @return
+     */
+    @GetMapping("/tree-userdept-info")
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "树形结构", notes = "树形结构")
+    public R<List<DeptVO>> getUserDeptTreeInfo(String tenantId, BladeUser bladeUser,String deptType) {
+        List<DeptVO> tree = deptService.getUserDeptTreeInfo(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()),deptType);
+        return R.data(tree);
+    }
+
+
+
 }

+ 8 - 0
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java

@@ -65,4 +65,12 @@ public interface DeptMapper extends BaseMapper<Dept> {
      */
     List<String> getDeptNames(Long[] ids);
 
+
+    /**
+     * 获取树形节点
+     *
+     * @param tenantId
+     * @return
+     */
+    List<DeptVO> getUserDeptTreeInfo(String tenantId,String deptType);
 }

+ 11 - 0
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml

@@ -121,4 +121,15 @@
         and is_deleted = 0
     </select>
 
+
+    <select id="getUserDeptTreeInfo" resultMap="treeNodeResultMap">
+        select id, parent_id,dept_name as deptName,  dept_name as title, id as "value", id as "key" from  blade_view_postuser where 1=1
+        <if test="param1!=null and param1!=''">
+            and tenant_id = #{param1}
+        </if>
+        <if test="param2!=null and param2!=''">
+            and dept_type = #{param2}
+        </if>
+        --ORDER BY sort
+    </select>
 </mapper>

+ 1 - 1
blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java

@@ -116,5 +116,5 @@ public interface IDeptService extends IService<Dept> {
      */
     List<DeptVO> search(String deptName, Long parentId);
 
-
+    List<DeptVO> getUserDeptTreeInfo(String tenantId,String deptType);
 }

+ 7 - 0
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -176,4 +176,11 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
         return DeptWrapper.build().listNodeVO(deptList);
     }
 
+
+
+    @Override
+    public List<DeptVO> getUserDeptTreeInfo(String tenantId,String deptType) {
+        return ForestNodeMerger.merge(baseMapper.getUserDeptTreeInfo(tenantId,deptType));
+    }
+
 }

+ 0 - 57
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -165,36 +165,6 @@ public class UserController {
     @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
     public R submit(@Valid @RequestBody UserDTO user) {
         CacheUtil.clear(USER_CACHE);
-        // 内控系统拆分
-/*        List<DeptUserVO> deptList = user.getDeptList();
-        if (deptList != null && deptList.size() >= 1) {
-            user.setRoleId(JSON.toJSONString(deptList));
-            String deptId = "";
-            String postId = "";
-            String isLaderpostId = "";
-            for (int i = 0; i < deptList.size(); i++) {
-                DeptUserVO deptUserVO = deptList.get(i);
-                if (i == 0) {
-                    deptId += deptUserVO.getDeptId() + "";
-                    postId += deptUserVO.getPostId() + "";
-                    if (deptUserVO.getIsLeader() == 1) {
-                        isLaderpostId = deptUserVO.getDeptId() + "";
-                    }
-                } else {
-                    deptId += "," + deptUserVO.getDeptId();
-                    postId += "," + deptUserVO.getPostId() + ",";
-                    if (deptUserVO.getIsLeader() == 1) {
-                        isLaderpostId = "," + deptUserVO.getDeptId();
-                    }
-                }
-            }
-            user.setPostId(postId);
-            user.setDeptId(deptId);
-            user.setRoleId(postId);
-            user.setIsLeader(isLaderpostId);
-        }*/
-
-
         return R.status(userService.submit(user));
     }
 
@@ -219,33 +189,6 @@ public class UserController {
     public R update(@Valid @RequestBody UserDTO user) {
         CacheUtil.clear(USER_CACHE);
         // 内控系统拆分
-/*        List<DeptUserVO> deptList = user.getDeptList();
-        if (deptList != null && deptList.size() >= 1) {
-            String deptId = "";
-            String postId = "";
-            String isLaderpostId = "";
-            for (int i = 0; i < deptList.size(); i++) {
-                DeptUserVO deptUserVO = deptList.get(i);
-                if (i == 0) {
-                    deptId += deptUserVO.getDeptId() + "";
-                    postId += deptUserVO.getPostId() + "";
-                    if (deptUserVO.getIsLeader() == 1) {
-                        isLaderpostId = deptUserVO.getDeptId() + "";
-                    }
-                } else {
-                    deptId += "," + deptUserVO.getDeptId();
-                    postId += "," + deptUserVO.getPostId() + ",";
-                    if (deptUserVO.getIsLeader() == 1) {
-                        isLaderpostId = "," + deptUserVO.getDeptId();
-                    }
-                }
-            }
-            user.setIsLeader(isLaderpostId);
-            user.setPostId(postId);
-            user.setDeptId(deptId);
-            user.setRoleId(postId);
-            user.setDeptInfo(JSONArray.toJSONString(deptList));
-        }*/
         return R.status(userService.updateUser(user));
     }
 

+ 0 - 1
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -34,7 +34,6 @@
         <result column="sys_type" property="sysType"/>
         <result column="is_leader" property="isLeader"/>
         <result column="one_money" property="oneMoney"/>
-        <result column="dept_info" property="deptInfo"/>
     </resultMap>
     <update id="updateRoleIdById">
         UPDATE blade_user

+ 6 - 0
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -119,6 +119,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         if (userCount > 0L && Func.isEmpty(user.getId())) {
             throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
         }
+
+        // 内控修改  当为部门负责人不为空时 执行
+        if (StringUtil.isBlank(user.getIsLeader())){
+            // 由于一个部门只有一个负责人  只能
+        }
+
         return save(user) && submitUserDept(user);
     }
 

+ 0 - 3
blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java

@@ -56,9 +56,6 @@ public class UserWrapper extends BaseEntityWrapper<User, UserVO> {
         userVO.setPostName(Func.join(postName));
         userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex()));
 
-        // 用户机构集合
-        userVO.setDeptList(JSON.parseArray(user.getDeptInfo(), DeptUserVO.class));
-
         // 用户所属 项目
         if (ObjectUtil.isNotEmpty(user.getUserType())) {
             String value = DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()).replace("[", "").replace("]", "");