feat: [试验管理] 计划表单选人

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java

@@ -8,8 +8,11 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.hxhq.business.domain.Study;
 import com.hxhq.business.dto.select.DeptUserTreeDto;
 import com.hxhq.business.enums.dept.DeptTypeEnum;
+import com.hxhq.business.enums.study.StudyTypeEnum;
+import com.hxhq.business.service.IStudyService;
 import com.hxhq.system.dto.UserExportDto;
 import com.hxhq.system.service.ISysConfigService;
 import org.apache.commons.lang3.ArrayUtils;
@@ -77,6 +80,8 @@ public class SysUserController extends BaseController
 
     @Autowired
     private TokenService tokenService;
+    @Autowired
+    private IStudyService studyService;
 
     /**
      * 获取用户列表
@@ -450,10 +455,14 @@ public class SysUserController extends BaseController
     @GetMapping("/studyUser")
     public AjaxResult studyUser(Long studyId,Long studySubjectId,String permit)
     {
-        if((studyId==null || studyId.longValue()<=0) && StringUtils.isBlank(permit)){
+        if(studyId==null || studyId.longValue()<=0){
             return AjaxResult.success(new ArrayList<>());
         }
-        List<DeptUserTreeDto> depts = userService.selectStudyUser(studyId,studySubjectId,permit);
+        Study study = studyService.getById(studyId);
+        if(study==null){
+            return AjaxResult.error("信息不存在");
+        }
+        List<DeptUserTreeDto> depts = userService.selectStudyUser(study.getType().equals(StudyTypeEnum.sy.getValue())?studyId:null,study.getType().equals(StudyTypeEnum.sy.getValue())?studySubjectId:null,study.getDeptId(),permit);
         return success(depts);
     }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java

@@ -170,5 +170,5 @@ public interface SysUserMapper
      * @param permit
      * @return
      */
-    List<DeptUserTreeDto> selectStudyUser(@Param("studyId") Long studyId, @Param("studySubjectId") Long studySubjectId, @Param("permit") String permit);
+    List<DeptUserTreeDto> selectStudyUser(@Param("studyId") Long studyId, @Param("studySubjectId") Long studySubjectId,@Param("deptId") Long deptId, @Param("permit") String permit);
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java

@@ -241,7 +241,7 @@ public interface ISysUserService
      * @param permit
      * @return
      */
-    List<DeptUserTreeDto> selectStudyUser(Long studyId,Long studySubjectId,String permit);
+    List<DeptUserTreeDto> selectStudyUser(Long studyId,Long studySubjectId,Long deptId, String permit);
 
     /**
      * 检查密码是否正确

hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java

@@ -581,8 +581,8 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     @Override
-    public List<DeptUserTreeDto> selectStudyUser(Long studyId, Long studySubjectId, String permit) {
-        return userMapper.selectStudyUser(studyId,studySubjectId,permit);
+    public List<DeptUserTreeDto> selectStudyUser(Long studyId, Long studySubjectId, Long deptId, String permit) {
+        return userMapper.selectStudyUser(studyId,studySubjectId,deptId,permit);
     }
 
     @Override

hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -283,6 +283,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			)
 		</if>
 
+		-- 部门
+		<if test="deptId != null and deptId != 0">
+			AND u.dept_id=#{deptId}
+		</if>
+
 		-- 权限
 		<if test="permit != null and permit != ''">
 			AND u.`user_id` IN (