陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsAttnController.java

@@ -161,12 +161,14 @@ public class CorpsAttnController extends BladeController {
 		if (!ObjectUtil.isEmpty(corpsAttn)) {
 			CorpsDesc corpsDesc = corpsDescService.getById(corpsAttn.getPid());
 			CorpListVo vo = BeanUtil.copy(corpsDesc, CorpListVo.class);
-			if (StringUtils.isNotBlank(corpsDesc.getBelongtocompany())) {
-				CorpsDesc company = corpsDescService.getById(corpsDesc.getBelongtocompany());
-				if (!ObjectUtil.isEmpty(company) && !ObjectUtil.isEmpty(vo)) {
-					vo.setBelongCompany(company.getCname());
-					return R.data(vo);
+			if (!ObjectUtil.isEmpty(vo)) {
+				if (StringUtils.isNotBlank(corpsDesc.getBelongtocompany())) {
+					CorpsDesc company = corpsDescService.getById(corpsDesc.getBelongtocompany());
+					if (!ObjectUtil.isEmpty(company)) {
+						vo.setBelongCompany(company.getCname());
+					}
 				}
+				return R.data(vo);
 			}
 		}
 		return R.data(null);

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -35,6 +35,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.cache.DictCache;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.enums.DictEnum;
@@ -112,8 +113,9 @@ public class DeptController extends BladeController {
 	 */
 	@GetMapping("/top-list")
 	@PreAuth(AuthConstant.PERMIT_ALL)
-	public R<List<DeptVO>> topList() {
+	public R<List<DeptVO>> topList(Dept dept) {
 		List<Dept> list = deptService.list(new LambdaQueryWrapper<Dept>()
+			.eq(ObjectUtil.isNotEmpty(dept.getDeptCategory()), Dept::getDeptCategory, dept.getDeptCategory())
 			.eq(Dept::getParentId, 0)
 			.eq(Dept::getTenantId, AuthUtil.getTenantId())
 			.eq(Dept::getIsDeleted, 0)

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -37,10 +37,7 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.*;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.ITenantClient;
 import org.springblade.system.user.entity.User;
@@ -111,6 +108,13 @@ public class UserController {
 			.eq(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
+
+		if (StringUtil.isNotBlank(userVO.getUserExt())) {
+			List<Long> userIdList = userService.getUserIdByCorpId(Long.parseLong(userVO.getUserExt()));
+			if (CollectionUtil.isNotEmpty(userIdList)) {
+				lambdaQueryWrapper.in(User::getId, userIdList);
+			}
+		}
 		return R.data(userService.list(lambdaQueryWrapper));
 	}
 

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -68,4 +68,12 @@ public interface UserMapper extends BaseMapper<User> {
 	 */
 	List<Map<String,Object>>  gainUser(@Param("tenantId")String tenantId);
 
+	/**
+	 * 根据客户ID获取用户ID
+	 *
+	 * @param corpId 客户ID
+	 * @return 列表
+	 */
+	List<Long> getUserIdByCorpId(@Param("corpId") Long corpId);
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -85,4 +85,8 @@
             AND name IS NOT NULL
     </select>
 
+    <select id="getUserIdByCorpId" resultType="long">
+        select user_id from basic_corps_attn where pid = #{corpId} and is_deleted = 0 and user_id is not null
+    </select>
+
 </mapper>

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -213,4 +213,13 @@ public interface IUserService extends BaseService<User> {
 	 * @return
 	 */
 	List<Map<String,Object>> gainUser(String tenantId);
+
+	/**
+	 * 根据客户ID获取用户ID
+	 *
+	 * @param corpId 客户ID
+	 * @return 列表
+	 */
+	List<Long> getUserIdByCorpId(Long corpId);
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -436,6 +436,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		return baseMapper.gainUser(tenantId);
 	}
 
+	@Override
+	public List<Long> getUserIdByCorpId(Long corpId) {
+		return baseMapper.getUserIdByCorpId(corpId);
+	}
+
 	/**
 	 * 查询顶级部门ID
 	 */