Parcourir la source

修改角色和用户bug接口

zhouzeyu il y a 1 jour
Parent
commit
757dfddfea

+ 1 - 1
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/controller/SysRoleController.java

@@ -77,7 +77,7 @@ public class SysRoleController extends BaseController {
     @Operation(summary = "角色管理删除")
     @PostMapping("/remove")
     @SaCheckPermission("sys:role:remove")
-    public CommonResult remove(@RequestParam("ids") Long id) {
+    public CommonResult remove(@RequestParam("id") Long id) {
         sysRoleService.remove(id);
         return CommonResult.success();
     }

+ 1 - 1
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/controller/SysUserController.java

@@ -80,7 +80,7 @@ public class SysUserController extends BaseController {
     @Operation(summary = "用户管理删除")
     @PostMapping("/remove")
     @SaCheckPermission("system:sysUser:remove")
-    public CommonResult remove(@RequestParam("ids") Long id) {
+    public CommonResult remove(@RequestParam("id") Long id) {
         sysUserService.remove(id);
         return CommonResult.success();
     }

+ 0 - 5
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysUserAddDTO.java

@@ -137,10 +137,5 @@ public class SysUserAddDTO implements Serializable {
 
     private String tenantId;
 
-    /**
-     * 删除标记 0存在;1删除
-     */
-    @TableLogic(value = "0",delval = "1")
-    private Integer delFlag;
 
 }

+ 2 - 2
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/ISysUserService.java

@@ -53,9 +53,9 @@ public interface ISysUserService extends IService<SysUserPO> {
     /**
      * 删除
      *
-     * @param ids
+     * @param id
      */
-    void remove(Long ids);
+    void remove(Long id);
 
     /**
      * 查看

+ 2 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysUserServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.tr.core.pojo.LoginUser;
 import cn.tr.core.pojo.SysRoleInfo;
+import cn.tr.module.common.menus.DelFlagEnum;
 import cn.tr.module.common.menus.StatusEnum;
 import cn.tr.module.common.menus.YesNoEnum;
 import cn.tr.module.common.utils.Constants;
@@ -218,6 +219,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepository, SysUserPO
         // 密码加密
         entity.setPassword(SecurityUtil.encryptPassword(entity.getPassword()));
         entity.setPswModified(YesNoEnum.NO.getCode());
+        entity.setDelFlag(Integer.valueOf(DelFlagEnum.NO.getCode()));
         this.save(entity);
 
         // 删除用户与岗位关联

+ 0 - 1
tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/app/auth/AppDoctorAuthGranter.java

@@ -77,7 +77,6 @@ public class AppDoctorAuthGranter implements IAuthGranter {
         StpLogic stpLogic = SecurityUtil.getStpLogic(StpTypeEnum.APP_DOCTOR.getText());
         // 检查该用户是否已有登录态,如有则先注销旧token
         if (stpLogic.isLogin(appUser.getId())) {
-            log.info("用户{}存在旧登录态,先注销旧token", source.getUsername());
             stpLogic.logout(appUser.getId());
         }
 

+ 2 - 2
tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/web/auth/WebAuthGranter.java

@@ -81,7 +81,8 @@ public class WebAuthGranter implements IAuthGranter {
                captchaTool.ver(source.getCodeKey(),source.getCode());
            }
         }
-        sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUserPO.class).eq(SysUserPO::getAccount, source.getUsername())
+        sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUserPO.class)
+                .eq(SysUserPO::getAccount, source.getUsername())
                 .last("limit 1"));
 
         if (Objects.isNull(sysUser)) {
@@ -118,7 +119,6 @@ public class WebAuthGranter implements IAuthGranter {
         StpLogic stpLogic = SecurityUtil.getStpLogic(StpTypeEnum.DEFAULT.getText());
         // 检查该用户是否已有登录态,如有则先注销旧token
         if (stpLogic.isLogin(sysUser.getId())) {
-            log.info("用户{}存在旧登录态,先注销旧token", source.getUsername());
             stpLogic.logout(sysUser.getId());
         }
         stpLogic.login(sysUser.getId());