列表增加职位

guns-sys/src/main/java/cn/stylefeng/guns/sys/core/constant/factory/ConstantFactory.java

@@ -24,6 +24,8 @@ import cn.stylefeng.guns.sys.core.constant.state.MenuStatus;
 import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
 import cn.stylefeng.guns.sys.core.log.LogObjectHolder;
 import cn.stylefeng.guns.sys.modular.system.entity.*;
 import cn.stylefeng.guns.sys.modular.system.entity.*;
 import cn.stylefeng.guns.sys.modular.system.mapper.*;
 import cn.stylefeng.guns.sys.modular.system.mapper.*;
+import cn.stylefeng.guns.sys.modular.system.service.PositionService;
+import cn.stylefeng.guns.sys.modular.system.service.UserPosService;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -51,6 +53,8 @@ public class ConstantFactory implements IConstantFactory {
     private UserMapper userMapper = SpringContextHolder.getBean(UserMapper.class);
     private UserMapper userMapper = SpringContextHolder.getBean(UserMapper.class);
     private MenuMapper menuMapper = SpringContextHolder.getBean(MenuMapper.class);
     private MenuMapper menuMapper = SpringContextHolder.getBean(MenuMapper.class);
     private NoticeMapper noticeMapper = SpringContextHolder.getBean(NoticeMapper.class);
     private NoticeMapper noticeMapper = SpringContextHolder.getBean(NoticeMapper.class);
+    private UserPosService userPosService = SpringContextHolder.getBean(UserPosService.class);
+    private PositionService positionService = SpringContextHolder.getBean(PositionService.class);
 
 
     public static IConstantFactory me() {
     public static IConstantFactory me() {
         return SpringContextHolder.getBean("constantFactory");
         return SpringContextHolder.getBean("constantFactory");
@@ -329,5 +333,23 @@ public class ConstantFactory implements IConstantFactory {
         return parentDeptIds;
         return parentDeptIds;
     }
     }
 
 
+    @Override
+    public String getPositionName(Long userId) {
+
+        StringBuilder positionNames = new StringBuilder();
+
+        List<UserPos> userPosList = this.userPosService.list(
+                new QueryWrapper<UserPos>().eq("user_id", userId));
+        if (userPosList != null && userPosList.size() > 0) {
+            for (UserPos userPos : userPosList) {
+                Position position = positionService.getById(userPos.getPosId());
+                positionNames.append(position.getName());
+            }
+        }
+
+        return positionNames.toString();
+
+    }
+
 
 
 }
 }

guns-sys/src/main/java/cn/stylefeng/guns/sys/core/constant/factory/IConstantFactory.java

@@ -139,4 +139,9 @@ public interface IConstantFactory {
      */
      */
     List<Long> getParentDeptIds(Long deptId);
     List<Long> getParentDeptIds(Long deptId);
 
 
+    /**
+     * 获取用户的职位名称
+     */
+    String getPositionName(Long userId);
+
 }
 }

guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/warpper/UserWrapper.java

@@ -54,6 +54,7 @@ public class UserWrapper extends BaseControllerWrapper {
         map.put("roleName", ConstantFactory.me().getRoleName((String) map.get("roleId")));
         map.put("roleName", ConstantFactory.me().getRoleName((String) map.get("roleId")));
         map.put("deptName", ConstantFactory.me().getDeptName(DecimalUtil.getLong(map.get("deptId"))));
         map.put("deptName", ConstantFactory.me().getDeptName(DecimalUtil.getLong(map.get("deptId"))));
         map.put("statusName", ConstantFactory.me().getStatusName((String) map.get("status")));
         map.put("statusName", ConstantFactory.me().getStatusName((String) map.get("status")));
+        map.put("positionName", ConstantFactory.me().getPositionName((Long) map.get("userId")));
     }
     }
 
 
 }
 }

guns-sys/src/main/webapp/assets/modular/system/user/user.js

@@ -28,10 +28,8 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
             {field: 'userId', hide: true, sort: true, title: '用户id'},
             {field: 'userId', hide: true, sort: true, title: '用户id'},
             {field: 'account', align: "center", sort: true, title: '账号'},
             {field: 'account', align: "center", sort: true, title: '账号'},
             {field: 'name', align: "center", sort: true, title: '姓名'},
             {field: 'name', align: "center", sort: true, title: '姓名'},
-            {field: 'sexName', align: "center", sort: true, title: '性别'},
-            {field: 'roleName', align: "center", sort: true, title: '角色'},
             {field: 'deptName', align: "center", sort: true, title: '部门'},
             {field: 'deptName', align: "center", sort: true, title: '部门'},
-            {field: 'email', align: "center", sort: true, title: '邮箱', minWidth: 122},
+            {field: 'positionName', align: "center", sort: true, title: '职位'},
             {field: 'phone', align: "center", sort: true, title: '电话', minWidth: 117},
             {field: 'phone', align: "center", sort: true, title: '电话', minWidth: 117},
             {field: 'createTime', align: "center", sort: true, title: '创建时间', minWidth: 160},
             {field: 'createTime', align: "center", sort: true, title: '创建时间', minWidth: 160},
             {field: 'status', align: "center", sort: true, templet: '#statusTpl', title: '状态'},
             {field: 'status', align: "center", sort: true, templet: '#statusTpl', title: '状态'},