From c294d48f38f9a0706b53d98a26457fe397cc6636 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 16 Jun 2023 09:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/qa/mapper/xml/KcEvaluationMapper.xml   |  2 +-
 .../system/controller/SysUserController.java  | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
index 285d75fd..e99db551 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml
@@ -159,7 +159,7 @@
         xsid, xsmc, format( tkzs / kcsl * 100, 2 ) AS ljtkv, format( jrtks / jrkcsl * 100, 2 ) AS jrtkv FROM
         (
         SELECT
-        dw.id, dw.xsid,  dw.xsmc, count( DISTINCT kt.id ) tkzs,
+        dw.dwbh as id, dw.xsid,  dw.xsmc, count( DISTINCT kt.id ) tkzs,
         count( DISTINCT CASE WHEN up_date = #{endTime} THEN kt.id END ) jrtks
         FROM
         kc_evaluation ev,kc_assessuser au, kc_casusers cu, kc_ketangbiao kt,kc_kkdw dw
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 9e601f95..a1abee74 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -296,6 +296,29 @@ public class SysUserController {
     }
 
 
+    @RequestMapping(value = "/queryUserRoleNew", method = RequestMethod.GET)
+    public Result<List<String>> queryUserRoleNew(@RequestParam(name = "userid", required = true) String userid) {
+
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("username",userid);
+        sysUserQueryWrapper.last("limit 1");
+        SysUser sysUser = sysUserService.getOne(sysUserQueryWrapper);
+
+        Result<List<String>> result = new Result<>();
+        List<String> list = new ArrayList<String>();
+        List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, sysUser.getId()));
+        if (userRole == null || userRole.size() <= 0) {
+            result.error500("未找到用户相关角色信息");
+        } else {
+            for (SysUserRole sysUserRole : userRole) {
+                list.add(sysUserRole.getRoleId());
+            }
+            result.setSuccess(true);
+            result.setResult(list);
+        }
+        return result;
+    }
+
     /**
 	  *  校验用户账号是否唯一<br>
 	  *  可以校验其他 需要检验什么就传什么。。。