小组修改代码提交

manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java

@@ -55,5 +55,9 @@ public interface SourceClueClient {
     @ApiOperation("查询资源标签")
     @PostMapping(API_PREFIX+"/findSourceLabel")
     ResponseEntity<List<ResSourceLabel>> findSourceLabel(@RequestBody List<Long> clueIds);
+
+    @ApiOperation("资源是否分配到此人")
+    @GetMapping(API_PREFIX + "/judgeMember")
+    ResponseEntity<Boolean> judgeMember(@RequestParam("judgeMemberId") Long judgeMemberId);
 }
 

manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClientFallback.java

@@ -56,4 +56,9 @@ public class SourceClueClientFallback implements SourceClueClient {
         return null;
     }
 
+    @Override
+    public ResponseEntity<Boolean> judgeMember(Long memberId) {
+        return null;
+    }
+
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -59,7 +59,6 @@ public class OrganizeServiceImpl implements OrganizeService {
     private final UserMessageService userMessageService;
     private final ExtensionNumberService extensionNumberService;
     private final CompanyRepository companyRepository;
-    private final ExtensionUserRepository extensionUserRepository;
 
     /**
      * 新增小组
@@ -94,6 +93,14 @@ public class OrganizeServiceImpl implements OrganizeService {
     @CacheEvict(value = "organize", key = "'organize:' + #organize.getId()")
     public void updateOrganize(Organize organize) {
         Organize updateOrganize = organizeRepository.findById(organize.getId()).orElseGet(Organize::new);
+        OrganizeUser organizeUser = organizeUserRepository.findByOrganizeIdAndIsLeader(organize.getId(), true);
+        // 判断组长是否分配过资源
+        if (organizeUser.getUserId() != organize.getUserId()){
+            Boolean flag = sourceClueClient.judgeMember(organizeUser.getUserId()).getBody();
+            if (flag) {
+                throw new BadRequestException("组长用户中有分配资源，组长替换失败");
+            }
+        }
         //添加(删除)分机号
         if (organize.getCallMode() != null && organize.getCallMode() != updateOrganize.getCallMode()){
             List<OrganizeUser> organizeList = organizeUserRepository.findByOrganizeId(organize.getId());
@@ -563,16 +570,19 @@ public class OrganizeServiceImpl implements OrganizeService {
         Long userId = SecurityUtils.getCurrentUserId();
         User user = userRepository.findById(userId).orElseGet(User::new);
         OrganizeUser organizeUser = organizeUserRepository.findByUserId(userId);
-        Organize organize = organizeRepository.findById(organizeUser.getOrganizeId()).orElseGet(Organize::new);
-        if (organize.getCallMode() == 1){
-            // (点呼)获取分机号
-            tel = String.valueOf(extensionNumberService.getExtension(userId).getNumber());
-        }else if (organize.getCallMode() == 2){
-            Company company = companyRepository.findById(user.getCompanyId()).orElseGet(Company::new);
-            tel = company.getTelX();
+        if (organizeUser != null){
+            Organize organize = organizeRepository.findById(organizeUser.getOrganizeId()).orElseGet(Organize::new);
+            if (organize.getCallMode() == 1){
+                // (点呼)获取分机号
+                tel = String.valueOf(extensionNumberService.getExtension(userId).getNumber());
+            }else if (organize.getCallMode() == 2){
+                Company company = companyRepository.findById(user.getCompanyId()).orElseGet(Company::new);
+                tel = company.getTelX();
+            }
+            callModeMap.put("callMode",organize.getCallMode());
+            callModeMap.put("callNum",tel);
+            return callModeMap;
         }
-        callModeMap.put("callMode",organize.getCallMode());
-        callModeMap.put("callNum",tel);
         return callModeMap;
     }
 

services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java

@@ -125,4 +125,10 @@ public class ClueController {
         return new ResponseEntity<>(clueService.findSourceLabel(clueIds), HttpStatus.OK);
     }
 
+    @ApiOperation("资源是否分配到此人")
+    @GetMapping("/judgeMember")
+    public ResponseEntity<Boolean> judgeMember(@RequestParam("judgeMemberId") Long judgeMemberId){
+        return new ResponseEntity<>(clueService.judgeMember(judgeMemberId), HttpStatus.OK);
+    }
+
 }

services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java

@@ -93,4 +93,8 @@ public interface ClueMiddleRepository extends JpaRepository<ClueMiddle, Long>, J
      */
     @Query(value = " select optimistic_version from tb_clue_middle where clue_id = ?1 ", nativeQuery = true)
     Integer lookUpOptimisticVersion(Long clueId);
+
+
+    @Query(value = "select clue_id from tb_clue_middle where member_id = ?1 limit 0 ,1 ", nativeQuery = true)
+    Long judgeMember(Long memberId);
 }

services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java

@@ -131,4 +131,10 @@ public interface ClueService {
      */
     List<ResSourceLabel> findSourceLabel(List<Long> clueIds);
 
+    /**
+     * 资源是否分配到此人
+     * @param memberId
+     * @return
+     */
+    Boolean judgeMember(Long memberId);
 }

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -269,4 +269,13 @@ public class ClueServiceImpl implements ClueService {
         return clueJpa.findSourceLabel(clueIds);
     }
 
+    @Override
+    public Boolean judgeMember(Long memberId) {
+        Long clueId = clueMiddleRepository.judgeMember(memberId);
+        if (clueId != null){
+            return true;
+        }
+        return false;
+    }
+
 }