派发选择人员时 只能选择同组的人员

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysUserController.java

@@ -3,12 +3,14 @@ package cn.wise.sc.cement.business.controller;
 import cn.wise.sc.cement.business.entity.Client;
 import cn.wise.sc.cement.business.entity.SysUser;
 import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.SysUserEnclosureQuery;
 import cn.wise.sc.cement.business.model.query.UserQuery;
 import cn.wise.sc.cement.business.model.vo.ProjectVo;
 import cn.wise.sc.cement.business.service.ISysUserService;
 import cn.wise.sc.cement.business.wrapper.WrapMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -106,9 +108,14 @@ public class SysUserController {
 
 	@ApiOperation(value = "人员列表")
 	@GetMapping("/getList")
-	public BaseResponse getById() {
+	public BaseResponse getList() {
 		try {
-			List<SysUser> list = userService.list();
+			LoginUser loginUser = userService.getLoginUser();
+			QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+			if(loginUser != null && loginUser.getGroupId() != null){
+				queryWrapper.eq("group_id", loginUser.getGroupId());
+			}
+			List<SysUser> list = userService.list(queryWrapper);
 			return BaseResponse.okData(list);
 		} catch (Exception e) {
 			log.debug("人员列表{}", e);
@@ -116,7 +123,6 @@ public class SysUserController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-
 	@ApiOperation(value = "上传附件")
 	@PostMapping("/uploadPeoplePF")
 	public BaseResponse uploadPeoplePF(@RequestBody SysUserEnclosureQuery query){

cement-business/target/classes/cn/wise/sc/cement/business/mapper/EntrustMapper.xml

@@ -77,8 +77,8 @@
         ) as 是否加急,
         IF(ISNULL(e.project_name),'',e.project_name) as 项目名称,
         IF(ISNULL(e.project_code),'',e.project_code)  as 项目编号,
-        IF(ISNULL(su.name),'',su.name) su.name as 委托人,
-        IF(ISNULL(c.name),'',c.name) c.name as 委托单位,
+        IF(ISNULL(su.name),'',su.name) as 委托人,
+        IF(ISNULL(c.name),'',c.name) as 委托单位,
         IF(ISNULL(e.entrust_date),'',e.entrust_date)  as 委托日期,
         IF(ISNULL(e.sample_num),'',e.sample_num) as 样品数量,
         (