Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java

@@ -4,17 +4,24 @@ import cn.hutool.core.util.StrUtil;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.utils.CacheClient;
 import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.*;
 import com.gxwebsoft.common.system.entity.AccessKey;
 import com.gxwebsoft.common.system.param.AccessKeyParam;
 import com.gxwebsoft.common.system.service.AccessKeyService;
 import io.swagger.annotations.Api;
+
+import java.util.concurrent.TimeUnit;
+
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Random;
+
+import static com.gxwebsoft.common.core.constants.WebsiteConstants.CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS;
 
 /**
  * 访问凭证管理控制器
@@ -30,6 +37,8 @@ public class AccessKeyController extends BaseController {
   private AccessKeyService accessKeyService;
   @Resource
   private CacheClient cacheClient;
+  @Resource
+  private RedisUtil redisUtil;
 
   @PreAuthorize("hasAuthority('sys:accessKey:list')")
   @OperationLog
@@ -41,13 +50,13 @@ public class AccessKeyController extends BaseController {
     if (param.getCode() != null) {
       // 短信验证码校验
       String code = cacheClient.get(param.getPhone(), String.class);
-        if (StrUtil.equals(code,param.getCode()) || "128880".equals(param.getCode())) {
+      if (StrUtil.equals(code, param.getCode()) || "128880".equals(param.getCode())) {
         return success(accessKeyPageResult);
       }
-        return fail("短信验证码不正确",null);
+      return fail("短信验证码不正确", null);
     }
     // 默认不给查看AccessSecret
-      accessKeyPageResult.getList().forEach( d -> {
+    accessKeyPageResult.getList().forEach(d -> {
       d.setAccessSecret(null);
     });
     return success(accessKeyPageResult);
@@ -147,4 +156,17 @@ public class AccessKeyController extends BaseController {
     return fail("删除失败");
   }
 
+  @PreAuthorize("hasAuthority('sys:accessKey:resetSMSCode')")
+  @OperationLog
+  @ApiOperation("重置万能短信验证码")
+  @PostMapping("/resetSMSCode")
+  public ApiResult<?> resetSMSCode() {
+    // 生成短信验证码
+    Random randObj = new Random();
+    String code = Integer.toString(100000 + randObj.nextInt(900000));
+    redisUtil.set(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS, code, 5L, TimeUnit.MINUTES);
+    return success("新验证码：".concat(code));
+  }
+
+
 }

src/main/java/com/gxwebsoft/common/system/controller/UserRoleController.java

@@ -1,47 +1,29 @@
 package com.gxwebsoft.common.system.controller;
 
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import com.gxwebsoft.common.core.web.BaseController;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.gxwebsoft.common.system.entity.User;
-import cn.hutool.core.util.ObjectUtil;
+import com.gxwebsoft.common.system.service.UserRoleService;
-import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.common.system.entity.UserRole;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.system.param.UserRoleParam;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gxwebsoft.common.core.web.ApiResult;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.*;
-import com.gxwebsoft.common.system.param.UserImportParam;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.result.LoginResult;
-import com.gxwebsoft.common.system.service.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
+import java.util.List;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
- * 用户控制器
+ * 用户角色控制器
  *
- * @author WebSoft
+ * @author 科技小王子
- * @since 2018-12-24 16:10:41
+ * @since 2025-06-16 20:39:53
  */
-@Slf4j
+@Api(tags = "用户角色管理")
-@Api(tags = "用户角色")
 @RestController
 @RequestMapping("/api/system/user-role")
 public class UserRoleController extends BaseController {
@@ -54,4 +36,99 @@ public class UserRoleController extends BaseController {
     return success(userRoleService.listByRoleId(id));
   }
 
+  @ApiOperation("分页查询用户角色")
+  @GetMapping("/page")
+  public ApiResult<PageResult<UserRole>> page(UserRoleParam param) {
+    // 使用关联查询
+    return success(userRoleService.pageRel(param));
+  }
+
+  @ApiOperation("查询全部用户角色")
+  @GetMapping()
+  public ApiResult<List<UserRole>> list(UserRoleParam param) {
+    // 使用关联查询
+    return success(userRoleService.listRel(param));
+  }
+
+
+  @ApiOperation("根据id查询用户角色")
+  @GetMapping("/{id}")
+  public ApiResult<UserRole> get(@PathVariable("id") Integer id) {
+    // 使用关联查询
+    return success(userRoleService.getByIdRel(id));
+  }
+
+  @PreAuthorize("hasAuthority('sys:userRole:save')")
+  @OperationLog
+  @ApiOperation("添加用户角色")
+  @PostMapping()
+  public ApiResult<?> save(@RequestBody UserRole userRole) {
+    // 记录当前登录用户id
+    User loginUser = getLoginUser();
+    if (loginUser != null) {
+      userRole.setUserId(loginUser.getUserId());
+    }
+    if (userRoleService.save(userRole)) {
+      return success("添加成功");
+    }
+    return fail("添加失败");
+  }
+
+  @ApiOperation("修改用户角色")
+  @PutMapping()
+  public ApiResult<?> update(@RequestBody UserRole userRole) {
+    final User loginUser = getLoginUser();
+    if (loginUser == null) {
+      return fail("请先登录");
+    }
+    if (userRoleService.updateById(userRole)) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:userRole:remove')")
+  @OperationLog
+  @ApiOperation("删除用户角色")
+  @DeleteMapping("/{id}")
+  public ApiResult<?> remove(@PathVariable("id") Integer id) {
+    if (userRoleService.removeById(id)) {
+      return success("删除成功");
+    }
+    return fail("删除失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:userRole:save')")
+  @OperationLog
+  @ApiOperation("批量添加用户角色")
+  @PostMapping("/batch")
+  public ApiResult<?> saveBatch(@RequestBody List<UserRole> list) {
+    if (userRoleService.saveBatch(list)) {
+      return success("添加成功");
+    }
+    return fail("添加失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:userRole:update')")
+  @OperationLog
+  @ApiOperation("批量修改用户角色")
+  @PutMapping("/batch")
+  public ApiResult<?> removeBatch(@RequestBody BatchParam<UserRole> batchParam) {
+    if (batchParam.update(userRoleService, "id")) {
+      return success("修改成功");
+    }
+    return fail("修改失败");
+  }
+
+  @PreAuthorize("hasAuthority('sys:userRole:remove')")
+  @OperationLog
+  @ApiOperation("批量删除用户角色")
+  @DeleteMapping("/batch")
+  public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+    if (userRoleService.removeByIds(ids)) {
+      return success("删除成功");
+    }
+    return fail("删除失败");
+  }
+
 }

src/main/java/com/gxwebsoft/common/system/controller/UserVerifyController.java

@@ -1,22 +1,23 @@
 package com.gxwebsoft.common.system.controller;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.Organization;
 import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.common.system.service.UserVerifyService;
 import com.gxwebsoft.common.system.entity.UserVerify;
 import com.gxwebsoft.common.system.param.UserVerifyParam;
-import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.system.service.OrganizationService;
-import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.system.service.UserVerifyService;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -36,6 +37,8 @@ public class UserVerifyController extends BaseController {
   private UserVerifyService userVerifyService;
   @Resource
   private UserService userService;
+  @Resource
+  private OrganizationService organizationService;
 
   @PreAuthorize("hasAuthority('sys:userVerify:list')")
   @ApiOperation("分页查询实名认证")
@@ -62,11 +65,23 @@ public class UserVerifyController extends BaseController {
 
   @ApiOperation("根据userId查询实名认证")
   @GetMapping("/myUserVerify")
-    public ApiResult<UserVerify> myUserVerify() {
+  public ApiResult<UserVerify> myUserVerify(UserVerifyParam param) {
-      if(getLoginUser() == null){
+    if (getLoginUser() == null) {
-        return fail("请先登录",null);
+      return fail("请先登录", null);
     }
-      return success(userVerifyService.getOne(new LambdaQueryWrapper<UserVerify>().eq(UserVerify::getUserId, getLoginUserId()).last("limit 1")));
+    final LambdaQueryWrapper<UserVerify> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(UserVerify::getUserId, getLoginUserId());
+    wrapper.eq(UserVerify::getDeleted, 0);
+    if(param.getStatus() != null){
+      wrapper.eq(UserVerify::getStatus, param.getStatus());
+    }
+    wrapper.last("limit 1");
+    final UserVerify one = userVerifyService.getOne(wrapper);
+    if(ObjUtil.isNotEmpty(one) && one.getOrganizationId() > 0){
+      final Organization organization = organizationService.getById(one.getOrganizationId());
+      one.setOrganizationName(organization.getOrganizationName());
+    }
+    return success(one);
   }
 
   @ApiOperation("提交实名认证")
@@ -82,6 +97,7 @@ public class UserVerifyController extends BaseController {
     return fail("提交失败");
   }
 
+  @Transactional(rollbackFor = Exception.class)
   @ApiOperation("修改实名认证")
   @PutMapping()
   public ApiResult<?> update(@RequestBody UserVerify userVerify) {
@@ -89,13 +105,25 @@ public class UserVerifyController extends BaseController {
     if (loginUser == null) {
       return fail("请先登录");
     }
-        if (userVerify.getStatus().equals(1)){
+
-          loginUser.setRealName(userVerify.getRealName());
+    final User byUserId = userService.getById(userVerify.getUserId());
-          if(userVerify.getType().equals(1)){
+    if (ObjUtil.isEmpty(byUserId)) {
-            loginUser.setRealName(userVerify.getName());
+      return fail("用户不存在");
     }
-          userService.updateById(loginUser);
+    // 不通过
+    byUserId.setCertification(false);
+    // 通过认证
+    if (userVerify.getStatus().equals(1)) {
+      byUserId.setRealName(userVerify.getRealName());
+      byUserId.setCertification(true);
+      byUserId.setType(userVerify.getType());
+      // 企业认证
+      if (userVerify.getType().equals(1)) {
+        byUserId.setRealName(userVerify.getName());
       }
+    }
+    userService.updateById(byUserId);
+
     if (userVerifyService.updateById(userVerify)) {
       return success("提交成功");
     }

src/main/java/com/gxwebsoft/common/system/controller/WxOfficialController.java

@@ -75,10 +75,10 @@ public class WxOfficialController extends BaseController {
 
   @ApiOperation("验证微信服务器")
   @GetMapping("/{id}")
-  public String validate(@PathVariable("id") Integer tenantId,@RequestParam String nonce,@RequestParam String timestamp,@RequestParam String signature,@RequestParam String echostr){
+  public String validate(@PathVariable("id") Integer tenantId, @RequestParam String nonce, @RequestParam String timestamp, @RequestParam String signature, @RequestParam String echostr) {
     System.out.println("nonce = " + nonce);
     System.out.println("tenantId = " + tenantId);
-    if(tenantId == null){
+    if (tenantId == null) {
       return null;
     }
     String token = "gxwebsoft";
@@ -87,7 +87,7 @@ public class WxOfficialController extends BaseController {
     Arrays.sort(array);
     // 将三个参数字符串拼接成一个字符串进行sha1加密
     StringBuilder sb = new StringBuilder();
-    for (String str: array){
+    for (String str : array) {
       sb.append(str);
     }
     final String strSha1 = DigestUtil.sha1Hex(sb.toString());
@@ -101,7 +101,7 @@ public class WxOfficialController extends BaseController {
   @Transactional(rollbackFor = {Exception.class})
   @RequestMapping("/{id}")
   @ResponseBody
-  public String receiveMessages(HttpServletRequest request,@PathVariable("id") Integer tenantId) throws IOException {
+  public String receiveMessages(HttpServletRequest request, @PathVariable("id") Integer tenantId) throws IOException {
     System.out.println("tenantId = " + tenantId);
     Integer userId = 0; // 用户ID
     // 从请求中获取XML数据
@@ -113,9 +113,9 @@ public class WxOfficialController extends BaseController {
     Element FromUserName = XmlUtil.getElement(rootElement, "FromUserName");
     String openId = FromUserName.getTextContent();
     System.out.println("openId = " + openId);
-    if(StrUtil.isNotBlank(openId)){
+    if (StrUtil.isNotBlank(openId)) {
       // 获取用户基本信息(UnionID机制)
-      final String userStr = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + getAccessToken() + "&openid="+ openId +"&lang=zh_CN");
+      final String userStr = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + getAccessToken() + "&openid=" + openId + "&lang=zh_CN");
       // 保存第三方用户信息表shop_user_oauth
       final JSONObject jsonObject = JSONObject.parseObject(userStr);
       final String unionid = jsonObject.getString("unionid");
@@ -123,15 +123,15 @@ public class WxOfficialController extends BaseController {
       System.out.println("unionid = " + unionid);
       sendTemplateMessage(openId);
       // 关注操作
-      if (subscribe != null &&subscribe.equals("1")) {
+      if (subscribe != null && subscribe.equals("1")) {
-        final int count = userOauthService.count(new LambdaQueryWrapper<UserOauth>().eq(UserOauth::getOauthType, MP_OFFICIAL).eq(UserOauth::getUnionid, unionid).eq(UserOauth::getTenantId,tenantId));
+        final int count = userOauthService.count(new LambdaQueryWrapper<UserOauth>().eq(UserOauth::getOauthType, MP_OFFICIAL).eq(UserOauth::getUnionid, unionid).eq(UserOauth::getTenantId, tenantId));
         System.out.println("count = " + count);
         if (count == 0) {
           // 其他平台是否有注册过
           final List<UserOauth> list = userOauthService.list(new LambdaQueryWrapper<UserOauth>().eq(UserOauth::getUnionid, unionid).eq(UserOauth::getDeleted, 0));
           final int size = list.size();
           // 新用户注册
-          if (size== 0) {
+          if (size == 0) {
             User user = new User();
             user.setStatus(0);
             user.setUsername("wxoff_".concat(RandomUtil.randomString(12)));
@@ -160,8 +160,8 @@ public class WxOfficialController extends BaseController {
           }
           // 更新
           if (!CollectionUtils.isEmpty(list)) {
-            for (UserOauth item: list){
+            for (UserOauth item : list) {
-              if(item.getUserId() != null){
+              if (item.getUserId() != null) {
                 userId = item.getUserId();
               }
             }
@@ -183,7 +183,7 @@ public class WxOfficialController extends BaseController {
     return null;
   }
 
-  private void sendTemplateMessage(String openId){
+  private void sendTemplateMessage(String openId) {
     String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + getAccessToken();
     TemplateMessage templateMessage = new TemplateMessage();
     templateMessage.setToUser(openId);
@@ -198,12 +198,12 @@ public class WxOfficialController extends BaseController {
       {{productType.DATA}}：{{name.DATA}} 消费时间：{{time.DATA}} {{remark.DATA}}
      */
     HashMap<String, TemplateMessageDTO> data = new HashMap<>();
-    data.put("first",new TemplateMessageDTO("您收到了一条新的订单。"));
+    data.put("first", new TemplateMessageDTO("您收到了一条新的订单。"));
-    data.put("tradeDateTime",new TemplateMessageDTO("02月18日 01时05分"));
+    data.put("tradeDateTime", new TemplateMessageDTO("02月18日 01时05分"));
-    data.put("customerInfo",new TemplateMessageDTO("广州 王俊"));
+    data.put("customerInfo", new TemplateMessageDTO("广州 王俊"));
-    data.put("orderItemName",new TemplateMessageDTO("兴趣车型"));
+    data.put("orderItemName", new TemplateMessageDTO("兴趣车型"));
-    data.put("orderItemData",new TemplateMessageDTO("骐达 2011款 1.6 CVT 舒适版"));
+    data.put("orderItemData", new TemplateMessageDTO("骐达 2011款 1.6 CVT 舒适版"));
-    data.put("remark",new TemplateMessageDTO("截止24日09:39分,您尚有10个订单未处理。"));
+    data.put("remark", new TemplateMessageDTO("截止24日09:39分,您尚有10个订单未处理。"));
     System.out.println("data = " + data);
     // 链式构建请求
     String result = HttpRequest.post(url)
@@ -219,31 +219,31 @@ public class WxOfficialController extends BaseController {
   public ApiResult<?> send(UserParam param) {
     // send发送订阅通知
     String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/bizsend?access_token=" + getAccessToken();
-    final UserOauth userOauth = userOauthService.getOne(new LambdaQueryWrapper<UserOauth>().eq(UserOauth::getUserId, param.getUserId()).eq(UserOauth::getOauthType,"MP-OFFICIAL").eq(UserOauth::getDeleted, 0));
+    final UserOauth userOauth = userOauthService.getOne(new LambdaQueryWrapper<UserOauth>().eq(UserOauth::getUserId, param.getUserId()).eq(UserOauth::getOauthType, "MP-OFFICIAL").eq(UserOauth::getDeleted, 0));
-    if(userOauth != null){
+    if (userOauth != null) {
       param.setOpenid(userOauth.getOauthId());
       final String oauthId = userOauth.getOauthId();
       // 跳转小程序链接
       HashMap<String, String> miniprogram = new HashMap<>();
-      miniprogram.put("appid",miniAppid);
+      miniprogram.put("appid", miniAppid);
-      miniprogram.put("pagepath","pages/chat/chat?friendId=" + param.getUserId());
+      miniprogram.put("pagepath", "pages/chat/chat?friendId=" + param.getUserId());
       // 参数
       HashMap<String, Object> data = new HashMap<>();
       final HashMap<String, String> thing1 = new HashMap<>();
       final HashMap<String, String> thing2 = new HashMap<>();
-      thing1.put("value","有新访客需要接待");
+      thing1.put("value", "有新访客需要接待");
-      thing2.put("value","吉媒小红娘");
+      thing2.put("value", "吉媒小红娘");
-      data.put("thing1",thing1);
+      data.put("thing1", thing1);
-      data.put("thing2",thing2);
+      data.put("thing2", thing2);
 
       // 请求主服务器获取用户信息
       HashMap<String, Object> map = new HashMap<>();
       map.put("access_token", getAccessToken());
-      map.put("touser",oauthId); // "opEVj6e1YIlMyovkOQFCLJ7llmuI"
+      map.put("touser", oauthId); // "opEVj6e1YIlMyovkOQFCLJ7llmuI"
       // 红娘来信通知
       map.put("template_id", templateId);
-      map.put("miniprogram",JSONObject.toJSONString(miniprogram));
+      map.put("miniprogram", JSONObject.toJSONString(miniprogram));
-      map.put("data",data);
+      map.put("data", data);
       // 新访客通知
 //    map.put("tid","XMpEsDHmZZqpiaAzmPqO0Gk_h39WCRkaNZ9VoSI9F34");
 //    map.put("page","https://admin.jimeigroup.cn");
@@ -258,12 +258,12 @@ public class WxOfficialController extends BaseController {
 
       JSONObject jsonObject = JSONObject.parseObject(result);
       System.out.println("jsonObject = " + jsonObject);
-      if(jsonObject != null){
+      if (jsonObject != null) {
         return success(jsonObject);
       }
     }
 
-    return fail("请求失败",getAccessToken());
+    return fail("请求失败", getAccessToken());
   }
 
   // 调用接口凭证
@@ -286,7 +286,7 @@ public class WxOfficialController extends BaseController {
     JSONObject response = JSON.parseObject(result);
     if (response.getString("access_token") != null) {
       // 存入缓存
-      redisUtil.set(key, result,7000L, TimeUnit.SECONDS);
+      redisUtil.set(key, result, 7000L, TimeUnit.SECONDS);
       return response.getString("access_token");
     }
     return null;
@@ -324,25 +324,26 @@ public class WxOfficialController extends BaseController {
       if (entity != null) {
         String result = EntityUtils.toString(entity, "UTF-8");
         System.out.println("result = " + result);
-        if(!result.contains("ok")){
+        if (!result.contains("ok")) {
           System.out.println("result = " + result);
           String key = MP_OFFICIAL.concat(":access_token:5");
           redisUtil.delete(key);
           return fail(result);
         }
-        return success("返回结果",entity);
+        return success("返回结果", entity);
       }
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
-    return fail("创建失败",url);
+    return fail("创建失败", url);
   }
 
   @ApiOperation("test")
   @PostMapping("/test")
-  public ApiResult<?> count(){
+  public ApiResult<?> count() {
     final int count = userOauthService.count(new LambdaQueryWrapper<UserOauth>().eq(UserOauth::getOauthType, MP_OFFICIAL).eq(UserOauth::getUnionid, "o0FaIuKa2UsVp6FCbvmZlrcaBRCM"));
     System.out.println("count = " + count);
     return success(getAccessToken());
   }
+
 }

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -248,7 +248,7 @@ public class User implements UserDetails {
     private String companyName;
 
     @ApiModelProperty("是否已实名认证")
-    private Integer certification;
+    private Boolean certification;
 
     @ApiModelProperty("机构名称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/common/system/entity/UserRole.java

@@ -1,21 +1,24 @@
 package com.gxwebsoft.common.system.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 用户角色
  *
- * @author WebSoft
+ * @author 科技小王子
- * @since 2018-12-24 16:10:23
+ * @since 2025-06-16 20:39:53
  */
 @Data
 @ApiModel(description = "用户角色")
@@ -43,6 +46,10 @@ public class UserRole implements Serializable {
   @TableField(exist = false)
   private String roleName;
 
+  @ApiModelProperty("角色标识")
+  @TableField(exist = false)
+  private String roleCode;
+
   @ApiModelProperty("租户ID")
   private Integer tenantId;
 

src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java

@@ -1,17 +1,15 @@
 package com.gxwebsoft.common.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
+
 /**
  * 实名认证
  *
@@ -65,6 +63,16 @@ public class UserVerify implements Serializable {
     @ApiModelProperty(value = "审核人")
     private Integer adminId;
 
+    @ApiModelProperty(value = "机构ID")
+    private Integer organizationId;
+
+    @ApiModelProperty(value = "机构ID")
+    @TableField(exist = false)
+    private String organizationName;
+
+    @ApiModelProperty(value = "用户角色ID")
+    private Integer userRoleId;
+
     @ApiModelProperty(value = "备注")
     private String comments;
 

src/main/java/com/gxwebsoft/common/system/mapper/UserRoleMapper.java

@@ -2,8 +2,10 @@ package com.gxwebsoft.common.system.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gxwebsoft.common.system.entity.Role;
 import com.gxwebsoft.common.system.entity.UserRole;
+import com.gxwebsoft.common.system.param.UserRoleParam;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,8 +13,8 @@ import java.util.List;
 /**
  * 用户角色Mapper
  *
- * @author WebSoft
+ * @author 科技小王子
- * @since 2018-12-24 16:10:02
+ * @since 2025-06-16 20:39:53
  */
 public interface UserRoleMapper extends BaseMapper<UserRole> {
 
@@ -42,4 +44,22 @@ public interface UserRoleMapper extends BaseMapper<UserRole> {
    */
   List<Role> selectByUserIds(@Param("userIds") List<Integer> userIds);
 
+  /**
+   * 分页查询
+   *
+   * @param page  分页对象
+   * @param param 查询参数
+   * @return List<UserRole>
+   */
+  List<UserRole> selectPageRel(@Param("page") IPage<UserRole> page,
+                               @Param("param") UserRoleParam param);
+
+  /**
+   * 查询全部
+   *
+   * @param param 查询参数
+   * @return List<User>
+   */
+  List<UserRole> selectListRel(@Param("param") UserRoleParam param);
+
 }

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRoleMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gxwebsoft.common.system.mapper.UserRoleMapper">
 
   <insert id="insertBatch">
@@ -12,11 +12,9 @@
   <select id="selectByUserId" resultType="com.gxwebsoft.common.system.entity.Role">
     SELECT *
     FROM sys_role
-        WHERE role_id IN (
+    WHERE role_id IN (SELECT role_id
-            SELECT role_id
                       FROM sys_user_role
-            WHERE user_id = #{userId}
+                      WHERE user_id = #{userId})
-        )
       AND deleted = 0
     ORDER BY role_id desc
   </select>
@@ -32,4 +30,38 @@
     AND b.deleted = 0
   </select>
 
+  <!-- 关联查询sql -->
+  <sql id="selectSql">
+    SELECT a.*, b.role_name, b.role_code
+    FROM sys_user_role a
+    LEFT JOIN sys_role b ON a.role_id = b.role_id
+    <where>
+      <if test="param.id != null">
+        AND a.id = #{param.id}
+      </if>
+      <if test="param.userId != null">
+        AND a.user_id = #{param.userId}
+      </if>
+      <if test="param.roleId != null">
+        AND a.role_id = #{param.roleId}
+      </if>
+      <if test="param.createTimeStart != null">
+        AND a.create_time &gt;= #{param.createTimeStart}
+      </if>
+      <if test="param.createTimeEnd != null">
+        AND a.create_time &lt;= #{param.createTimeEnd}
+      </if>
+    </where>
+  </sql>
+
+  <!-- 分页查询 -->
+  <select id="selectPageRel" resultType="com.gxwebsoft.common.system.entity.UserRole">
+    <include refid="selectSql"></include>
+  </select>
+
+  <!-- 查询全部 -->
+  <select id="selectListRel" resultType="com.gxwebsoft.common.system.entity.UserRole">
+    <include refid="selectSql"></include>
+  </select>
+
 </mapper>

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml

@@ -4,9 +4,10 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*, b.phone
+        SELECT a.*, b.phone, c.organization_name
         FROM sys_user_verify a
         LEFT JOIN sys_user b ON a.user_id = b.user_id
+        LEFT JOIN sys_organization c ON a.organization_id = c.organization_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}
@@ -38,6 +39,12 @@
             <if test="param.zzCode != null">
                 AND a.zz_code = #{param.zzCode}
             </if>
+            <if test="param.adminId != null">
+              AND a.admin_id = #{param.adminId}
+            </if>
+            <if test="param.organizationId != null">
+              AND a.organization_id = #{param.organizationId}
+            </if>
             <if test="param.comments != null">
                 AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
             </if>

src/main/java/com/gxwebsoft/common/system/param/UserRoleParam.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.common.system.param;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户角色查询参数
+ *
+ * @author 科技小王子
+ * @since 2025-06-16 20:39:53
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel(value = "UserRoleParam对象", description = "用户角色查询参数")
+public class UserRoleParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    @QueryField(type = QueryType.EQ)
+    private Integer id;
+
+    @ApiModelProperty(value = "用户id")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @ApiModelProperty(value = "角色id")
+    @QueryField(type = QueryType.EQ)
+    private Integer roleId;
+
+}

src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java

@@ -57,6 +57,14 @@ public class UserVerifyParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private String zzCode;
 
+    @ApiModelProperty(value = "管理员ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer adminId;
+
+    @ApiModelProperty(value = "机构ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer organizationId;
+
     @ApiModelProperty(value = "备注")
     private String comments;
 

src/main/java/com/gxwebsoft/common/system/service/UserRoleService.java

@@ -1,16 +1,18 @@
 package com.gxwebsoft.common.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.Role;
 import com.gxwebsoft.common.system.entity.UserRole;
+import com.gxwebsoft.common.system.param.UserRoleParam;
 
 import java.util.List;
 
 /**
  * 用户角色Service
  *
- * @author WebSoft
+ * @author 科技小王子
- * @since 2018-12-24 16:10:35
+ * @since 2025-06-16 20:39:53
  */
 public interface UserRoleService extends IService<UserRole> {
 
@@ -40,4 +42,29 @@ public interface UserRoleService extends IService<UserRole> {
   List<Role> listByUserIds(List<Integer> userIds);
 
   List<UserRole> listByRoleId(Integer roleId);
+
+  /**
+   * 分页关联查询
+   *
+   * @param param 查询参数
+   * @return PageResult<UserRole>
+   */
+  PageResult<UserRole> pageRel(UserRoleParam param);
+
+  /**
+   * 关联查询全部
+   *
+   * @param param 查询参数
+   * @return List<UserRole>
+   */
+  List<UserRole> listRel(UserRoleParam param);
+
+  /**
+   * 根据id查询
+   *
+   * @param id 主键id
+   * @return UserRole
+   */
+  UserRole getByIdRel(Integer id);
+
 }

src/main/java/com/gxwebsoft/common/system/service/impl/UserRoleServiceImpl.java

@@ -3,9 +3,12 @@ package com.gxwebsoft.common.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.system.entity.Role;
-import com.gxwebsoft.common.system.entity.UserRole;
 import com.gxwebsoft.common.system.mapper.UserRoleMapper;
 import com.gxwebsoft.common.system.service.UserRoleService;
+import com.gxwebsoft.common.system.entity.UserRole;
+import com.gxwebsoft.common.system.param.UserRoleParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,13 +16,12 @@ import java.util.List;
 /**
  * 用户角色Service实现
  *
- * @author WebSoft
+ * @author 科技小王子
- * @since 2018-12-24 16:10:36
+ * @since 2025-06-16 20:39:53
  */
 @Service
 public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
 
-
   @Override
   public int saveBatch(Integer userId, List<Integer> roleIds) {
     return baseMapper.insertBatch(userId, roleIds);
@@ -39,4 +41,29 @@ public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> i
   public List<UserRole> listByRoleId(Integer roleId) {
     return list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getRoleId, roleId));
   }
+
+  @Override
+  public PageResult<UserRole> pageRel(UserRoleParam param) {
+    PageParam<UserRole, UserRoleParam> page = new PageParam<>(param);
+    page.setDefaultOrder("create_time desc");
+    List<UserRole> list = baseMapper.selectPageRel(page, param);
+    return new PageResult<>(list, page.getTotal());
+  }
+
+  @Override
+  public List<UserRole> listRel(UserRoleParam param) {
+    List<UserRole> list = baseMapper.selectListRel(param);
+    // 排序
+    PageParam<UserRole, UserRoleParam> page = new PageParam<>();
+    page.setDefaultOrder("create_time desc");
+    return page.sortRecords(list);
+  }
+
+  @Override
+  public UserRole getByIdRel(Integer id) {
+    UserRoleParam param = new UserRoleParam();
+    param.setId(id);
+    return param.getOne(baseMapper.selectListRel(param));
+  }
+
 }

src/test/java/com/gxwebsoft/generator/SysGenerator.java

@@ -52,6 +52,7 @@ public class SysGenerator {
 //    "sys_domain",
 //      "sys_company",
 //      "sys_user_verify"
+//      "sys_user_role"
   };
   // 需要去除的表前缀
   private static final String[] TABLE_PREFIX = new String[]{