权限标识从roleId更改为roleCode

module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexServiceImpl.java

@@ -29,7 +29,6 @@ import org.jeecg.modules.system.service.ISysUserDepartService;
 import org.jeecg.modules.xmcbDetail.mapper.ComContractInfoExchangeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -139,7 +138,9 @@ public class IndexServiceImpl implements IndexService {
             if (departNameList != null && !departNameList.isEmpty()) {
                 departNames = departNameList;
             } else {
-                departNames = sysDepartMapper.getSysUserOfDepartNameList(sysUser.getId());
+                //departNames = sysDepartMapper.getSysUserOfDepartNameList(sysUser.getId());
+                String[] deptIds = sysUser.getDepartIds().split(",");
+                departNames = sysDepartMapper.getDepNameByIds(deptIds);
             }
             if (departNames.isEmpty()) return incomeDataInfoVO;
 
@@ -358,7 +359,8 @@ public class IndexServiceImpl implements IndexService {
         ArrayList<String> tasknoList = new ArrayList<>();
 
         if (AuthMark.DEPT_LEADER.equals(role)) {
-            List<String> departNames = sysDepartMapper.getSysUserOfDepartNameList(sysUser.getId());
+            String[] deptIds = sysUser.getDepartIds().split(",");
+            List<String> departNames = sysDepartMapper.getDepNameByIds(deptIds);
             if (departNames.isEmpty()) return totalContractNumInfoVO;
 
             StringBuilder stringBuilder = new StringBuilder();
@@ -570,7 +572,8 @@ public class IndexServiceImpl implements IndexService {
             if (departNameList != null && !departNameList.isEmpty()) {
                 departNames = departNameList;
             } else {
-                departNames = sysDepartMapper.getSysUserOfDepartNameList(sysUser.getId());
+                String[] deptIds = sysUser.getDepartIds().split(",");
+                departNames = sysDepartMapper.getDepNameByIds(deptIds);
             }
             if (departNames.isEmpty()) return indexTotalVo;
 
@@ -841,7 +844,8 @@ public class IndexServiceImpl implements IndexService {
             if (departNameList != null && !departNameList.isEmpty()) {
                 departNames = departNameList;
             } else {
-                departNames = sysDepartMapper.getSysUserOfDepartNameList(sysUser.getId());
+                String[] deptIds = sysUser.getDepartIds().split(",");
+                departNames = sysDepartMapper.getDepNameByIds(deptIds);
             }
 
             if (departNames.isEmpty()) return resVo;
@@ -1466,18 +1470,19 @@ public class IndexServiceImpl implements IndexService {
     public List<String> getDepNameBySysUser() {
         // 获取登录人用户信息 V2.0版本：
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        // 获取用户id
-        String userId = sysUser.getId();
-        //根据用户id去找部门id
-        List<String> sysUserDepartIds = sysUserDepartService.getUserDepartIdByUid(userId);
-        System.out.println(sysUserDepartIds);
-        ///根据部门id去找部门名称
-        List<String> sysDepartNames = new ArrayList<>();
-        for (String sysUserDepartId : sysUserDepartIds) {
-            sysDepartNames.add(sysDepartService.getDepNameById(sysUserDepartId));
-        }
-        System.out.println(sysDepartNames);
-        return sysDepartNames;
+//        // 获取用户id
+//        String userId = sysUser.getId();
+//        //根据用户id去找部门id
+//        List<String> sysUserDepartIds = sysUserDepartService.getUserDepartIdByUid(userId);
+//        System.out.println(sysUserDepartIds);
+//        ///根据部门id去找部门名称
+//        List<String> sysDepartNames = new ArrayList<>();
+//        for (String sysUserDepartId : sysUserDepartIds) {
+//            sysDepartNames.add(sysDepartService.getDepNameById(sysUserDepartId));
+//        }
+//        System.out.println(sysDepartNames);
+        String[] deptIds = sysUser.getDepartIds().split(",");
+        return  sysDepartMapper.getDepNameByIds(deptIds);
     }
 
     /**
@@ -2452,6 +2457,7 @@ public class IndexServiceImpl implements IndexService {
      * @return IndexChartInfoVo<BigDecimal>
      */
     public IndexChartInfoVo<BigDecimal> getTotalReceivedByDate(IndexInfoParamDto indexInfoParamDto, String userId,List<String> departNameList) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //1.创建一个IndexChartInfoVo实例用来存储最后返回前端的信息
         IndexChartInfoVo<BigDecimal> indexChartInfoVo = new IndexChartInfoVo<>();
         BigDecimal initValue = BigDecimal.valueOf(0); //某年或某月没有任务，已收款为0
@@ -2492,7 +2498,8 @@ public class IndexServiceImpl implements IndexService {
         if (departNameList!=null && !departNameList.isEmpty()){
             sysDepartNames = departNameList;
         }else {
-            sysDepartNames =  sysDepartMapper.getSysUserOfDepartNameList(userId);
+            String[] deptIds = sysUser.getDepartIds().split(",");
+            sysDepartNames = sysDepartMapper.getDepNameByIds(deptIds);
         }
 
         System.out.println("查出的部门列表：");

module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexZcbServiceImpl.java

@@ -15,6 +15,7 @@ import org.jeecg.modules.Index.mapper.IndexZcbMapper;
 import org.jeecg.modules.Index.service.IndexZcbService;
 import org.jeecg.modules.Index.util.AuthMark;
 import org.jeecg.modules.Index.util.CommonMethod;
+import org.jeecg.modules.system.mapper.SysDepartMapper;
 import org.jeecg.modules.system.mapper.SysUserDepartMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,6 +60,9 @@ public class IndexZcbServiceImpl implements IndexZcbService {
     @SuppressWarnings("all")
     private SysUserDepartMapper sysUserDepartMapper;
 
+    @Autowired
+    private SysDepartMapper sysDepartMapper;
+
 
     /**
      *   author: dzc
@@ -68,7 +72,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
      */
     @Override
     public List<IndexTotalVo> getZhiChuTotalList(HttpServletRequest request,List<String> departNameList) {
-
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ArrayList<IndexTotalVo> projectZhiChusList = new ArrayList<>();
         IndexTotalVo projectZhiChu = new IndexTotalVo();
         // 获取当前登录的用户名
@@ -83,7 +87,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             role = AuthMark.DEPT_LEADER;
             deptList = departNameList;
         }else {
-            deptList = sysUserDepartMapper.getDepartByUsername(username);
+            String[] deptIds = sysUser.getDepartIds().split(",");
+            deptList = sysDepartMapper.getDepNameByIds(deptIds);
         }
         // 根据用户名查询对应的部门
 
@@ -325,6 +330,7 @@ public class IndexZcbServiceImpl implements IndexZcbService {
      */
     @Override
     public List<EightCostChartInfoVo> getEightCostsList(IndexInfoParamDto indexInfoParamDto,HttpServletRequest request,List<String> departNameList) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //获取当前登录的用户名，根据用户名查询对应的部门
         //Subject subject = SecurityUtils.getSubject();
         //LoginUser loginUser = (LoginUser)subject.getPrincipal();
@@ -337,7 +343,8 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             role = AuthMark.DEPT_LEADER;
             deptList = departNameList;
         }else {
-            deptList  = sysUserDepartMapper.getDepartByUsername(username);
+            String[] deptIds = sysUser.getDepartIds().split(",");
+            deptList = sysDepartMapper.getDepNameByIds(deptIds);
         }
         // 该用户的部门
 
@@ -709,8 +716,9 @@ public class IndexZcbServiceImpl implements IndexZcbService {
     public List<ResultEightCost> getSumEightCosts(IndexInfoParamDto indexInfoParamDto,HttpServletRequest request,List<String> departNameList) {
 
         //获取当前登录的用户名，根据用户名查询对应的部门
-        //Subject subject = SecurityUtils.getSubject();
-        //LoginUser loginUser = (LoginUser)subject.getPrincipal();
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        Subject subject = SecurityUtils.getSubject();
+//        LoginUser loginUser = (LoginUser)subject.getPrincipal();
         //String username = loginUser.getUsername();
         String username = JwtUtil.getUserNameByToken(request);
         // 查询当前用户的角色id (一个用户可能对应多个角色)
@@ -721,7 +729,9 @@ public class IndexZcbServiceImpl implements IndexZcbService {
             deptList = departNameList;
         }else {
             // 该用户的部门
-            deptList = sysUserDepartMapper.getDepartByUsername(username);
+            //deptList = sysUserDepartMapper.getDepartByUsername(username);
+            String[] deptIds = sysUser.getDepartIds().split(",");
+            deptList = sysDepartMapper.getDepNameByIds(deptIds);
         }
         // 创建响应给前端的实体
         ArrayList<ResultEightCost> resultList = new ArrayList<>();

module_kzks/src/main/java/org/jeecg/modules/Index/util/AuthMark.java

@@ -3,16 +3,16 @@ package org.jeecg.modules.Index.util;
 public class AuthMark {
 
     /*总领导*/
-    public static String BOSS = "1705758794195161090";
+    public static String BOSS = "boss";
 
     /*部门领导*/
-    public static String DEPT_LEADER = "1705760017153544194";
+    public static String DEPT_LEADER = "departLeader";
 
     /*员工*/
-    public static String STAFF = "1705760110619414530";
+    public static String STAFF = "staff";
 
 
     /*管理员*/
-    public static String ADMIN = "f6817f48af4fb3af11b9e8bf182f618b";
+    public static String ADMIN = "admin";
 
 }

module_kzks/src/main/java/org/jeecg/modules/Index/util/CommonMethod.java

@@ -15,14 +15,14 @@ public class CommonMethod {
 
     public String getRole(String userName){
         String role = null;
-        List<String> roleIds = sysBaseApi.getRoleIdsByUsername(userName);
+        List<String> roleCodes = sysBaseApi.getRolesByUsername(userName);
         ArrayList<String> roles = new ArrayList<>();
         roles.add(AuthMark.BOSS);
         roles.add(AuthMark.DEPT_LEADER);
         roles.add(AuthMark.STAFF);
 
         int count = 0;
-        for (String roleId : roleIds) {
+        for (String roleId : roleCodes) {
             if (roles.contains(roleId)) {
                 role = roleId;
                 count++;

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -149,7 +149,6 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
                 }
             });
             projectCostHuiji.setDeptNames(departNames);
-            System.out.println(departNames.toString());
         }
 
         if (AuthMark.BOSS.equals(role)) {