diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml index 1bd7537f..fac8142c 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml @@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_ext ex on u.user_id=ex.user_id - where u.del_flag = '0' + where u.del_flag = '0' and u.remark is null AND u.user_id = #{userId} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java index ac0f2bdf..1a929457 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java @@ -69,7 +69,7 @@ public class BusExamUserController extends BaseController * @RequiresPermissions("manage:busExamUser:query") */ @GetMapping(value = "/last/{proId}") - public AjaxResult findBusExamUserList(@PathVariable("userId") Long proId,Long userId) + public AjaxResult findBusExamUserList(@PathVariable("proId") Long proId,Long userId) { BusExamUser query = new BusExamUser(); query.setUserId(userId); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java index a5f29782..e4f0d0bd 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java @@ -107,7 +107,7 @@ public class WxController extends BaseController { public AjaxResult findProSubDeptsUserInfo(@PathVariable("proId") Long proId) { LoginUser loginUser = SecurityUtils.getLoginUser(); - if(SysUser.isAdmin(loginUser.getUserid()) ||SecurityUtils.isGSAdmin()){ + if(SecurityUtils.isAdmin(loginUser.getUserid()) || SecurityUtils.isGSAdmin()){ ProProjectInfo projectInfo = proProjectInfoService.selectProProjectInfoById(proId); ProProjectInfoSubdeptsUsers adminUser = new ProProjectInfoSubdeptsUsers(); adminUser.setId(0L); @@ -122,7 +122,7 @@ public class WxController extends BaseController { adminUser.setUserName(loginUser.getSysUser().getNickName()); return success(adminUser); }else{ - return success(proProjectInfoSubdeptsUsersService.findProSubDeptsUserInfo(proId, SecurityUtils.getUserId())); + return success(proProjectInfoSubdeptsUsersService.findProSubDeptsUserInfo(proId, loginUser.getUserid())); } } diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml index d9a5d457..70205925 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml @@ -79,7 +79,6 @@ -