后台菜单添加在线考试

src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java

@@ -36,8 +36,8 @@ public class SysRoleController extends PaginationController<SysRole> {
 
     @ApiOperation(value="1001 分页查询角色", notes="分页查询角色")
     @GetMapping(value = "/queryRoles")
-    public GridModel queryRolesByPagination(CurUser curUser, @Valid FindRolePaginDTO findRolePaginDTO, BindingResult bindingResult){
-        sysRoleServiceImpl.queryRolesByPagination(getPaginationUtility(), findRolePaginDTO);
+    public GridModel queryRolesByPagination(CurUser curUser){
+        sysRoleServiceImpl.queryRolesByPagination(getPaginationUtility(), curUser.getCorpId());
         GridModel gridModel = getGridModelResponse();
         return  gridModel;
     }
@@ -48,7 +48,7 @@ public class SysRoleController extends PaginationController<SysRole> {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                sysRoleServiceImpl.queryRolesAll());
+                sysRoleServiceImpl.queryRolesAll(curUser.getCorpId()));
 
     }
 

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -29,10 +29,11 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
      */
     @Select("<script>select * from tm_admin_role " +
             "where r_status = 1 " +
-            "and r_id not in ('主管理员','子管理员') " +
+            "and r_name not in ('主管理员','子管理员') " +
+            "and corp_id = #{corpId} " +
             " order by r_name desc </script>")
     @ResultMap(value = "SelectAllAndUserNum")
-    List<SysRole> queryRoles();
+    List<SysRole> queryRoles(@Param("corpId") String corpId);
 
     //获得此角色的用户数
     int countUserNum(String roleId);

src/main/java/org/rcisoft/sys/role/service/SysRoleService.java

@@ -7,6 +7,7 @@ import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.dept.entity.DeptRole;
 import org.rcisoft.sys.role.dto.*;
 import org.rcisoft.sys.role.entity.SysRole;
+import org.rcisoft.sys.user.bean.CurUser;
 
 import java.util.List;
 
@@ -39,13 +40,13 @@ public interface SysRoleService {
     /**
      * 分页查询角色
      * @param pageUtil
-     * @param findRolePaginDTO
+     * @param corpId
      * @return
      */
-    List<SysRole> queryRolesByPagination(PageUtil pageUtil, FindRolePaginDTO findRolePaginDTO);
+    List<SysRole> queryRolesByPagination(PageUtil pageUtil, String corpId);
 
 
-    List<SysRole> queryRolesAll();
+    List<SysRole> queryRolesAll(String corpId);
 
     //select 
     List<SysRole> queryRolesSelect(SysRole sysRole);

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -13,6 +13,7 @@ import org.rcisoft.sys.role.dao.SysRoleRepository;
 import org.rcisoft.sys.role.dto.*;
 import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.role.service.SysRoleService;
+import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dao.SysUserMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,21 +90,21 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    public List<SysRole> queryRolesByPagination(PageUtil pageUtil, FindRolePaginDTO findRolePaginDTO) {
+    public List<SysRole> queryRolesByPagination(PageUtil pageUtil, String corpId) {
 //        SysRole sysRole = new SysRole();
 //        BeanUtils.copyProperties(findRolePaginDTO,sysRole);
 //        sysRole.setNotDeleted();
 //        sysRole.setStart();
-        return sysRoleRepository.queryRoles();
+        return sysRoleRepository.queryRoles(corpId);
     }
 
     @Override
-    public List<SysRole> queryRolesAll() {
+    public List<SysRole> queryRolesAll(String corpId) {
 //        SysRole sysRole = new SysRole();
 //        BeanUtils.copyProperties(findRolePaginDTO,sysRole);
 //        sysRole.setNotDeleted();
 //        sysRole.setStart();
-        return sysRoleRepository.queryRoles();
+        return sysRoleRepository.queryRoles(corpId);
     }
 
     @Override

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -120,10 +120,7 @@ public class SysUserServiceImpl implements SysUserService {
                     userRoles.add(userRole);
                 }
             }
-            result += sysUserMapper.insertUserRoleById(userRoles);
-            if (result > 0) {
-                return 1;
-            }
+            result = sysUserMapper.insertUserRoleById(userRoles);
         }
         return 0;
     }
@@ -174,7 +171,28 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public List<QueryMenuResDTO> queryMenusById(String corpId, String id, String modelId) {
-        return sysUserMapper.queryMenus(corpId, id, modelId);
+
+        List<QueryMenuResDTO> menus = sysUserMapper.queryMenus(corpId, id, modelId);
+        String[] strings = new String[]{"题库管理", "试卷管理", "统计分析"};
+        QueryMenuResDTO newMenu = new QueryMenuResDTO();
+        newMenu.setMenuName("在线考试");
+        newMenu.setHref("newTest");
+        newMenu.setMenuId("000");
+
+        int size = menus.size();
+        for (String str : strings) {
+            for (QueryMenuResDTO menu : menus) {
+                if (menu.getMenuName().equals(str)) {
+                    menus.add(newMenu);
+                    break;
+                }
+            }
+            if(size < menus.size()){
+                break;
+            }
+        }
+
+        return menus;
     }
 
     @Override
@@ -263,7 +281,7 @@ public class SysUserServiceImpl implements SysUserService {
         }
         String updateTime = df.format(synchronizationTime.getSynchronizationTime());
         List<GetAllRspDTO> userGetRspDTOList = mtCotactApiRequestClient.accountGetMyInfoList(corpId, updateTime);
-        if (null == userGetRspDTOList){
+        if (null == userGetRspDTOList) {
             throw new ServiceException(ResultServiceEnums.ZX_FAILED);
         }
         List<SysUser> personnelsList = new ArrayList<>();
@@ -295,7 +313,7 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public MyInfoDTO queryMyInfo(CurUser curUser) {
         MyInfoDTO myInfoDTOCount = sysUserMapper.queryMyLessonCount(curUser);
-        MyInfoDTO myInfoDTO =  sysUserMapper.queryMyInfo(curUser);
+        MyInfoDTO myInfoDTO = sysUserMapper.queryMyInfo(curUser);
         myInfoDTO.setLessonCount(myInfoDTOCount.getLessonCount());
         myInfoDTO.setTrainCount(myInfoDTOCount.getTrainCount());
         myInfoDTO.setNotFinishedExam(myInfoDTOCount.getNotFinishedExam());