Przeglądaj źródła

首页,用户管理功能bug修复

huzhe 1 rok temu
rodzic
commit
1041ca86ba

+ 1 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtBagController.java

@@ -56,7 +56,7 @@ public class PtBagController extends BaseController {
     private final ErrFillBusiness errFillBusiness;
     private final ErrFillBusiness errFillBusiness;
 
 
     //根据userId查询账户余额
     //根据userId查询账户余额
-    @SaCheckPermission("payment:ptBag:query")
+//    @SaCheckPermission("payment:ptBag:query")
     @GetMapping("/selectAccountBalanceByIds")
     @GetMapping("/selectAccountBalanceByIds")
     public R<String> selectAccountBalanceByIds(@RequestParam("userIds") String userIds) {
     public R<String> selectAccountBalanceByIds(@RequestParam("userIds") String userIds) {
         return R.ok(ptBagService.selectAccountBalanceByIds(userIds));
         return R.ok(ptBagService.selectAccountBalanceByIds(userIds));

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java

@@ -59,7 +59,7 @@ public class SysDeptController extends BaseController {
      *
      *
      * @param deptId 部门ID
      * @param deptId 部门ID
      */
      */
-    @SaCheckPermission("system:dept:query")
+//    @SaCheckPermission("system:dept:query")
     @GetMapping(value = "/{deptId}")
     @GetMapping(value = "/{deptId}")
     public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
     public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
         deptService.checkDeptDataScope(deptId);

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java

@@ -60,7 +60,7 @@ public class SysPostController extends BaseController {
      *
      *
      * @param postId 岗位ID
      * @param postId 岗位ID
      */
      */
-    @SaCheckPermission("system:post:query")
+//    @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
     @GetMapping(value = "/{postId}")
     public R<SysPostVo> getInfo(@PathVariable Long postId) {
     public R<SysPostVo> getInfo(@PathVariable Long postId) {
         return R.ok(postService.selectPostById(postId));
         return R.ok(postService.selectPostById(postId));

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java

@@ -57,7 +57,7 @@ public class SysProfileController extends BaseController {
         ProfileVo profileVo = new ProfileVo();
         ProfileVo profileVo = new ProfileVo();
         profileVo.setUser(user);
         profileVo.setUser(user);
         profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId()));
         profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId()));
-        profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId()));
+//        profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId()));
         return R.ok(profileVo);
         return R.ok(profileVo);
     }
     }
 
 

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -86,7 +86,7 @@ public class SysUser extends TenantEntity {
     /**
     /**
      * 手机号码
      * 手机号码
      */
      */
-    @EncryptField(algorithm = AlgorithmType.BASE64)
+//    @EncryptField(algorithm = AlgorithmType.BASE64)
     private String phone;
     private String phone;
 
 
     /**
     /**

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java

@@ -43,7 +43,7 @@ public class SysUserProfileBo extends BaseEntity {
      */
      */
     @Sensitive(strategy = SensitiveStrategy.PHONE)
     @Sensitive(strategy = SensitiveStrategy.PHONE)
     @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确")
     @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确")
-    private String phonenumber;
+    private String phone;
 
 
     /**
     /**
      * 用户性别(0男 1女 2未知)
      * 用户性别(0男 1女 2未知)

+ 1 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -97,6 +97,7 @@ public class SysUserServiceImpl implements ISysUserService {
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("del_flag", UserConstants.USER_NORMAL)
         wrapper.eq("del_flag", UserConstants.USER_NORMAL)
             .eq(ObjectUtil.isNotNull(user.getUserId()), "user_id", user.getUserId())
             .eq(ObjectUtil.isNotNull(user.getUserId()), "user_id", user.getUserId())
+            .eq(ObjectUtil.isNotNull(user.getUserNumb()), "user_numb", user.getUserNumb())
             .like(StringUtils.isNotBlank(user.getUserName()), "user_name", user.getUserName())
             .like(StringUtils.isNotBlank(user.getUserName()), "user_name", user.getUserName())
             .like(StringUtils.isNotBlank(user.getRealName()), "real_name", user.getRealName())
             .like(StringUtils.isNotBlank(user.getRealName()), "real_name", user.getRealName())
             .eq(StringUtils.isNotBlank(user.getStatus()), "status", user.getStatus())
             .eq(StringUtils.isNotBlank(user.getStatus()), "status", user.getStatus())