Przeglądaj źródła

列表里有一个未认证,但是下拉筛选选择未认证以后,列表里没有显示未认证的成员,其他的筛选项目无误,不知道这是是否存在问题

lipf 5 miesięcy temu
rodzic
commit
4ba07de8cc

+ 3 - 3
platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -33,8 +33,8 @@ public class UserRoleController extends BaseController {
 
     /**
      * 获取角色列表
-     * @param sysRoleVo
-     * @return
+     * @param sysRoleVo 角色信息
+     * @return HttpResult<List<SysRole>>
      */
     @Operation(summary = "角色列表")
     @PostMapping("/roleList")
@@ -45,7 +45,7 @@ public class UserRoleController extends BaseController {
 
     @Operation(summary = "角色信息查询")
     @GetMapping("/roleGet")
-    public HttpResult roleGet(String roleId){
+    public HttpResult<SysRoleVo> roleGet(String roleId){
         return HttpResult.ok(userRoleService.roleGet(roleId));
     }
 

+ 6 - 7
platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -13,8 +13,9 @@ import com.jzg.commons.entity.vo.SysRoleVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.*;
-import com.jzg.service.SysSystemService;
 import com.jzg.service.UserRoleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,11 +28,7 @@ import java.util.stream.Collectors;
 @Service
 public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements UserRoleService, HistoryDataService {
 
-    @Autowired
-    SysSystemService sysSystemService;
-
-    @Autowired
-    SysMenuMapper sysMenuMapper;
+    private static final Logger log = LoggerFactory.getLogger(UserRoleServiceImpl.class);
 
     @Autowired
     SysRolePermsMapper sysRolePermsMapper;
@@ -57,11 +54,13 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
 
     @Override
     public SysRoleVo roleGet(String roleId) {
+        log.info("查询角色的权限: roleId=[{}]",roleId);
         String userSystemCode = baseController.getUserSystemCode();
         SysRole sysRole = baseMapper.selectOne(new LambdaQueryWrapper<SysRole>()
                 .eq(SysRole::getId,roleId)
                 .eq(SysRole::getSystemCode,userSystemCode));
         if(Objects.isNull(sysRole)){
+            log.info("根据租户代码[{}]和roleId[{}]没有找到角色信息",userSystemCode,roleId);
             throw new SystemException("角色不存在");
         }
         List<SysRolePerms> sysRolePerms = sysRolePermsMapper.getByRoleIdNew(roleId);
@@ -76,7 +75,7 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
             if (!sysRoleDataScope.equals("2")) {
                 List<SysRoleDataScopeLink> sysRoleDataScopeLinks = sysRoleDataScopeLinkMapper.selectList(new LambdaQueryWrapper<SysRoleDataScopeLink>()
                         .eq(SysRoleDataScopeLink::getRoleId, roleId));
-                vo.setDeptIds(sysRoleDataScopeLinks.stream().map(x -> x.getDeptId()).collect(Collectors.toList()));
+                vo.setDeptIds(sysRoleDataScopeLinks.stream().map(SysRoleDataScopeLink::getDeptId).collect(Collectors.toList()));
             }
             sysRoleVo.setDataScope(vo);
         }

+ 1 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -195,6 +195,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserInfoListVo.setStatus(null);
             typeStatus.add(UserState.UserStateEnum.COMPANY_REVIEW_ING.getValue());
             typeStatus.add(UserState.UserStateEnum.RESIGN_ING.getValue());
+            typeStatus.add(UserState.UserStateEnum.NOT_CERT.getValue());
             sysUserInfoListVo.setTypeStatus(typeStatus);
         }
         // 前端 查询成员和查询业务员的接口,都使用的是这个接口,但是他们区分的时候,差异很大,因此这里将查询成员和查询业务员的接口拆分开来