fix: 团队管理-修复问题

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -43,6 +43,7 @@ import com.qunzhixinxi.hnqz.admin.entity.*;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.BatchPackageExcelModel;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
+import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.*;
 import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
@@ -2441,16 +2442,19 @@ public class WmScorePackageController {
 			List<String> split = StrUtil.split(typeId, StrUtil.C_COMMA);
 			queryWrapper.in(WmScorePackage::getTypeid, split);
 		}
-		// 判断当前用户是否配置了团队负责人
-		List<WmTeam> teamList = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
-				.eq(WmTeam::getDeptId, sendDeptId)
-				.eq(WmTeam::getEnableFlag, EnableEnum.ENABLE.val())
-				.eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val())
-				.apply("FIND_IN_SET({0}, leader)", String.valueOf(userId)));
-		if (CollectionUtil.isNotEmpty(teamList)) {
-			// 如果配置了，则只查询所在团队下发的积分包
-			List<String> teamIdList = teamList.stream().map(wmTeam -> String.valueOf(wmTeam.getId())).collect(Collectors.toList());
-			queryWrapper.in(WmScorePackage::getPackageUserScope, teamIdList);
+		if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(String.valueOf(packageType1))
+				&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2))) {
+			// 如果是个人承接-按积分值，判断当前用户是否配置了团队负责人
+			List<WmTeam> teamList = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
+					.eq(WmTeam::getDeptId, sendDeptId)
+					.eq(WmTeam::getEnableFlag, EnableEnum.ENABLE.val())
+					.eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val())
+					.apply("FIND_IN_SET({0}, leader)", String.valueOf(userId)));
+			if (CollectionUtil.isNotEmpty(teamList)) {
+				// 如果配置了，则只查询所在团队下发的积分包
+				List<String> teamIdList = teamList.stream().map(wmTeam -> String.valueOf(wmTeam.getId())).collect(Collectors.toList());
+				queryWrapper.in(WmScorePackage::getPackageUserScope, teamIdList);
+			}
 		}
 
 		Page<WmScorePackage> wmScorePackagePage = wmScorePackageMapper.selectPage(new Page<>(current, size), queryWrapper

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -678,7 +678,9 @@
 				LEFT JOIN sys_user_role r ON r.user_id = u.user_id
 		WHERE
 			u.dept_id = #{deptId}
-		  AND (u.username LIKE CONCAT('%',#{realNameOrPhone},'%') OR u.realname LIKE CONCAT('%',#{realNameOrPhone},'%'))
+		  <if test="realNameOrPhone != null and realNameOrPhone != ''">
+		  	AND (u.username LIKE CONCAT('%',#{realNameOrPhone},'%') OR u.realname LIKE CONCAT('%',#{realNameOrPhone},'%'))
+		  </if>
 		  AND r.role_id IN (
 			<foreach collection="roleList" item="roleId" index="index" separator=",">
 				#{roleId}