修复区域用户绑定失败

src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java

@@ -282,9 +282,9 @@ public class BmsRegion2Controller {
      * @param regionBo
      * @return
      */
-    @PostMapping("/editBatch")
-    @SysLog(module = SystemModule.BASE, title = "区域档案", biz = BizType.INSERT)
-    @PreAuthorize("hasRole('bms:region:insert')")
+    //@PostMapping("/editBatch")
+    //@SysLog(module = SystemModule.BASE, title = "区域档案", biz = BizType.INSERT)
+    //@PreAuthorize("hasRole('bms:region:insert')")
     public R<?> editBatch(@RequestBody @Valid BmsRegionBatchBo regionBo){
         ValidateTools.valid(regionBo.getRegionList());
         for (BmsRegionBatchBo.BmsRegionBo BmsRegion2Bo : regionBo.getRegionList()) {

src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java

@@ -155,7 +155,11 @@ public class BmsRegionUserController {
             List<BmsRegion> regionList = bmsRegionService.listByIds(param.getRegionIds());
             for (BmsRegion region : regionList) {
                 LambdaQueryWrapper<BmsChannelPoint> pointLqw = new LambdaQueryWrapper<>();
-                pointLqw.eq(BmsChannelPoint::getSaleRegionId,region.getId());
+                pointLqw.and(plqw->{
+                    plqw.eq(BmsChannelPoint::getSaleRegionId,region.getId())
+                            .or()
+                            .likeRight(BmsChannelPoint::getSaleRegionPathIds,region.getPathIds()+"_");
+                });
                 pointLqw.select(BmsChannelPoint::getId);
                 //区域有那些网点
                 List<BmsChannelPoint> pointList = channelPointService.list(pointLqw);
@@ -168,7 +172,11 @@ public class BmsRegionUserController {
             List<BmsRegion2> regionList = bmsRegion2Service.listByIds(param.getRegionIds());
             for (BmsRegion2 region : regionList) {
                 LambdaQueryWrapper<BmsChannelPoint> pointLqw = new LambdaQueryWrapper<>();
-                pointLqw.eq(BmsChannelPoint::getBizRegionId,region.getId());
+                pointLqw.and(plqw->{
+                    plqw.eq(BmsChannelPoint::getBizRegionId,region.getId())
+                            .or()
+                    .likeRight(BmsChannelPoint::getBizRegionPathIds,region.getPathIds()+"_");
+                });
                 pointLqw.select(BmsChannelPoint::getId);
                 //区域有那些网点
                 List<BmsChannelPoint> pointList = channelPointService.list(pointLqw);

src/main/java/com/qs/serve/modules/his/controller/HistTestController.java

@@ -22,8 +22,8 @@ import java.util.List;
  */
 @Slf4j
 @AllArgsConstructor
-//@RestController
-//@RequestMapping("his/dev")
+@RestController
+@RequestMapping("his/dev")
 public class HistTestController {
 
     HisUserChannelPointService hisUserChannelPointService;

src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java

@@ -63,6 +63,7 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl<HisUserChannelPo
                     HisUserChannelPoint userChannelPoint = new HisUserChannelPoint();
                     userChannelPoint.setUserId(masterUser.getUserId());
                     userChannelPoint.setPointId(channelPoint.getId());
+                    userChannelPoint.setSourceIds(channelPoint.getId()+"");
                     userChannelPoint.setSourceType(3);
                     saveList.add(userChannelPoint);
                 }
@@ -180,7 +181,14 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl<HisUserChannelPo
             channelPointList.add(userChannelPoint);
         }
         this.saveBatch(channelPointList);
-        //2.区域管理人
+        //3.渠道负责人
+        LambdaQueryWrapper<BmsMasterUser> masterUserLqw2 = new LambdaQueryWrapper<>();
+        masterUserLqw2.eq(BmsMasterUser::getType, MasterUserType.Channel);
+        List<BmsMasterUser> masterUsersByChannel = masterUserMapper.selectList(masterUserLqw2);
+        for (BmsMasterUser masterUser : masterUsersByChannel) {
+            this.flushByChannelId(Long.parseLong(masterUser.getTargetId()));
+        }
+        //4.区域管理人
         this.initSetupByPointId(0L);
     }
 

src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java

@@ -55,7 +55,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
             this.initByUserId(userId,false);
             userIds = Arrays.asList(userId);
         }
-        if(CollectionUtil.isNotEmpty(userIds)){
+        if(CollectionUtil.isEmpty(userIds)){
             return new ArrayList<>();
         }
         HisUserSupplier userSupplier = param.toHisUserSupplier(null,null);