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> queryUserRoleNew(@RequestParam(name = "userid", required = true) String userid) { + + QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); + sysUserQueryWrapper.eq("username",userid); + sysUserQueryWrapper.last("limit 1"); + SysUser sysUser = sysUserService.getOne(sysUserQueryWrapper); + + Result> result = new Result<>(); + List list = new ArrayList(); + List userRole = sysUserRoleService.list(new QueryWrapper().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; + } + /** * 校验用户账号是否唯一
* 可以校验其他 需要检验什么就传什么。。。