admin用户判断

business-service/src/main/java/com/ozs/service/mapper/BaseUserMapper.java

@@ -37,4 +37,6 @@ public interface BaseUserMapper extends BaseMapper<BaseUser> {
     BaseUser getUserName(@Param("userName") String userName);
     
     List<String> getRoleName(@Param("userId")String userId);
+
+    BaseUser getUserById(@Param("id")Long id);
 }

business-service/src/main/java/com/ozs/service/service/BaseUserService.java

@@ -17,6 +17,8 @@ public interface BaseUserService extends IService<BaseUser> {
 
     BaseUser getUser(String userId);
 
+    BaseUser getUserById(Long id);
+
     BaseUser getUserName(@Param("userName") String userName);
 
     List<String> getRoleName(@Param("userId")String userId);

business-service/src/main/java/com/ozs/service/service/impl/BaseUserServiceImpl.java

@@ -58,6 +58,10 @@ public class BaseUserServiceImpl extends ServiceImpl<BaseUserMapper, BaseUser> i
     public BaseUser getUser(String userId) {
         return baseUserMapper.getUser(userId);
     }
+    @Override
+    public BaseUser getUserById(Long id) {
+        return baseUserMapper.getUserById(id);
+    }
 
     @Override
     public BaseUser getUserName(String userName) {

business-service/src/main/resources/mapper/service/BaseUserMapper.xml

@@ -75,4 +75,7 @@
         SELECT  r.role_name FROM `sys_user` u JOIN sys_user_role ur ON u.id=ur.user_id JOIN sys_role r 
          ON ur.role_id=r.role_id WHERE u.user_id=#{userId}
     </select>
+    <select id="getUserById" resultType="com.ozs.service.entity.BaseUser">
+    select user_id userId, dept_id deptId, data_permission dataPermission,nick_name nickName,user_name userName from sys_user where id = #{id}
+    </select>
 </mapper>

hazard-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -164,8 +164,14 @@ public class SysRoleController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role)
     {
-        roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
+//        roleService.checkRoleAllowed(role);
+//        roleService.checkRoleDataScope(role.getRoleId());
+        if (!ObjectUtils.isEmpty(role.getRoleKey())){
+            role.setRoleKey("admin");
+        }
+        if (!ObjectUtils.isEmpty(role.getStatus())){
+            role.setStatus("1");
+        }
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -21,8 +22,10 @@ import com.ozs.common.utils.file.FileUtils;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
+import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.MsgAlarmVo;
+import com.ozs.service.service.BaseUserService;
 import com.ozs.system.service.DataScoreUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -81,6 +84,8 @@ public class SysUserController extends BaseController {
     private String defaultPassword;
     @Autowired
     private DataScoreUtil dataScoreUtil;
+    @Resource
+    private BaseUserService baseUserService;
 //    /**
 //     * 获取用户列表
 //     */
@@ -247,6 +252,10 @@ public class SysUserController extends BaseController {
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
 //        userService.checkUserAllowed(user);
 //        userService.checkUserDataScope(user.getId());
+        BaseUser baseUser = baseUserService.getUserById(user.getId());
+        if (baseUser.getUserName().equals("admin")){
+            return success("admin账号不能修改");
+        }
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhoneNum())
@@ -309,6 +318,12 @@ public class SysUserController extends BaseController {
         if (ArrayUtils.contains(Ids, getId())) {
             return error("当前用户不能删除");
         }
+        for (Long id : Ids) {
+            BaseUser baseUser = baseUserService.getUserById(id);
+            if (baseUser.getUserName().equals("admin")){
+                return success("admin账号不能修改");
+            }
+        }
         return toAjax(userService.deleteUserByIds(Ids));
     }
     ///**
@@ -428,6 +443,10 @@ public class SysUserController extends BaseController {
     @ApiOperation("数据权限分配")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     public AjaxResult dataPermission(@PathVariable("id") Long id, @PathVariable("dataPermission") Integer dataPermission) {
+        BaseUser baseUser = baseUserService.getUserById(id);
+        if (baseUser.getUserName().equals("admin")){
+            return success("admin账号不能修改");
+        }
         if (userService.dataPermission(id, dataPermission)) {
             return success();
         } else {