fix 87891 全所统计--个别科室选择后，没有回显负责人

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -12,6 +12,7 @@ import com.jero.common.util.oConvertUtils;
 import com.jero.mail.commont.constant;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.project.service.IPayWorkingGroupService;
@@ -264,8 +265,8 @@ public class AllProjectStatisticsController {
         queryWrapper.eq("org_code", departCode);
         queryWrapper.eq("del_flag", 0);
         queryWrapper.eq("status", 1);
-        List<SysUser> pageList = sysUserService.list(queryWrapper);
+        List<SysUser> sysUserSysDepartModels = sysUserService.listUserByOrgCode(departCode);
-        return Result.OK(pageList);
+        return Result.OK(sysUserSysDepartModels);
     }
 
     /**

jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java

@@ -102,6 +102,14 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * @return
 	 */
 	List<SysUserSysDepartModel> getUserByOrgCode(IPage page, @Param("orgCode") String orgCode, @Param("userParams") SysUser userParams);
+/**
+	 * 根据 orgCode 查询用户，包括子部门下的用户
+	 *
+	 * @param orgCode
+	 * @param userParams 用户查询条件，可为空
+	 * @return
+	 */
+	List<SysUserSysDepartModel> getUserByOrgCode(@Param("orgCode") String orgCode, @Param("userParams") SysUser userParams);
 
 
     /**
@@ -171,4 +179,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     void forgetPassword(@Param("user") SysUser user);
 
+	List<SysUser> listUserByOrgCode(@Param("orgCode") String orgCode, @Param("userParams") SysUser userParams);
 }

jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -217,4 +217,12 @@
 		select *
 		from pay_manager_management where phone = #{username} and del_flag = 0;
     </select>
+
+	<select id="listUserByOrgCode" resultType="com.jero.modules.system.entity.SysUser">
+		SELECT
+		sys_user.*
+		<include refid="getUserByOrgCodeFromSql"/>
+		ORDER BY
+		sys_depart.org_code
+	</select>
 </mapper>

jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java

@@ -140,6 +140,8 @@ public interface ISysUserService extends IService<SysUser> {
 	 */
 	IPage<SysUserSysDepartModel> queryUserByOrgCode(String orgCode, SysUser userParams, IPage page);
 
+	List<SysUser> listUserByOrgCode(String orgCode);
+
 	/**
 	 * 根据角色Id查询
 	 * @param

jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -331,6 +331,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return result;
 	}
 
+	@Override
+	public List<SysUser> listUserByOrgCode(String orgCode) {
+		List<SysUser> list = baseMapper.listUserByOrgCode(orgCode, null);
+
+		return list;
+	}
+
 	// 根据角色Id查询
 	@Override
 	public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) {