Merge remote-tracking branch 'origin/test' into test

src/main/java/com/glxp/api/controller/auth/InvBusUserController.java

@@ -128,9 +128,7 @@ public class InvBusUserController {
     @AuthRuleAnnotation("")
     @PostMapping("/spms/bus/user/warehouse/post")
     public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
-        boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
         if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
-
             invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
             relBusRequset.getSelectActions().forEach(action ->
             {
@@ -138,8 +136,8 @@ public class InvBusUserController {
                 invBusUserEntity.setUserId(relBusRequset.getUserId());
                 invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode());
                 invBusUserEntity.setScAction(action);
-//                invBusUserEntity.setId(IdUtil.getSnowflakeNextId());
-                invBusUserService.insertInvBusUser(invBusUserEntity);
+                invBusUserEntity.setId(IdUtil.getSnowflakeNextId());
+                invBusUserService.save(invBusUserEntity);
             });
         }
         InvBusUserEntity invBusUserEntity = new InvBusUserEntity();