diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java index 82f3ce25..ebf42a13 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/UserRepository.java @@ -158,8 +158,8 @@ public interface UserRepository extends JpaRepository, JpaSpecificat * @return */ @Query(value = "SELECT u.* FROM sys_user u, sys_users_roles r WHERE" + - " u.user_id = r.user_id AND r.role_id in ?1", nativeQuery = true) - List findAllManage(List roleIds); + " u.user_id = r.user_id AND r.role_id in ?1 AND u.company_id = ?2", nativeQuery = true) + List findAllManage(List roleIds,Long userId); /** * 查询用户id diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java index d0c9a958..c870a8bc 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java @@ -90,6 +90,8 @@ public class OrganizeServiceImpl implements OrganizeService { Organize updateOrganize = organizeRepository.findById(organize.getId()).orElseGet(Organize::new); updateOrganize.setOrganizeName(organize.getOrganizeName()); updateOrganize.setCallMode(organize.getCallMode()); + // 设置一个无用的字段,save方法会验证validation的验证参数 + updateOrganize.setUserId(0L); organizeRepository.save(updateOrganize); } if (organize.getUserId() != null) { diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index 6a0d8052..39d39ee8 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -179,7 +179,8 @@ public class UserServiceImpl implements UserService { @Override public List findByManager(List roleIds) { - List users = userRepository.findAllManage(roleIds); + User user = userRepository.findById(SecurityUtils.getCurrentUserId()).orElseGet(User::new); + List users = userRepository.findAllManage(roleIds,user.getCompanyId()); return userMapper.toDto(users); } diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index 1d37bdfc..83e23cb7 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -169,11 +169,11 @@ public class ClueServiceImpl implements ClueService { if (clueQueryCriteria.getId() != null) { for (ClueDto clueDto : clueDtoList) { //循环查库,ID查询只一次循环 - String organizeStr = organizeClient.query(clueDto.getOrganizeId()).getBody().toString(); - String str = organizeStr.replaceAll("=", ":"); - JSONArray jsonArray = JSONUtil.parseArray(str); - JSONObject jsonObject = JSONUtil.parseObj(jsonArray.get(0)); - clueDto.setCallMode((Integer)jsonObject.get("callMode")); +// String organizeStr = organizeClient.query(clueDto.getOrganizeId()).getBody().toString(); +// String str = organizeStr.replaceAll("=", ":"); +// JSONArray jsonArray = JSONUtil.parseArray(str); +// JSONObject jsonObject = JSONUtil.parseObj(jsonArray.get(0)); +// clueDto.setCallMode((Integer)jsonObject.get("callMode")); Map> mapList = organizeClient.getLabel(clueDto.getTaskId(), clueDto.getOrganizeId()).getBody(); clueDto.setBaseLabel(mapList.get("baseLabel")); clueDto.setOrganizeLabel(mapList.get("organizeLabel"));