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

mall-server-api/src/main/java/com/gree/mall/manager/controller/worker/WorkerTeamController.java

@@ -64,6 +64,13 @@ public class WorkerTeamController {
         return ResponseHelper.success();
     }
 
+    @PostMapping("/del")
+    @ApiOperation("删除")
+    public ResponseHelper del(@RequestBody List<String> ids) throws RemoteServiceException {
+        workerTeamLogic.del(ids);
+        return ResponseHelper.success();
+    }
+
     @PostMapping("/query/websit/worker")
     @ApiOperation("查询网点入驻的师傅")
     public ResponseHelper<List<WebsitWorkerBean>> queryWebsitWorker (

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -143,6 +143,10 @@ public class UserLogic {
             }).collect(Collectors.toList());
         }
 
+        if (Objects.nonNull(userZfireParamBean.getIgnoreWebsitRole())) {
+            userZfireParamBean.setAdminWebsitIds(null);
+        }
+
         IPage<UserVO> userVOIPage = commonMapper.userList(new Page(userZfireParamBean.getPageNum(), userZfireParamBean.getPageSize()), userZfireParamBean, null, slaveWorkerList);
         return userVOIPage;
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerTeamLogic.java

@@ -290,4 +290,8 @@ public class WorkerTeamLogic {
             throw new RemoteServiceException("师傅" + workerTeam.getAssistantWorkerId() + "未入驻成功");
         }
     }
+
+    public void del(List<String> ids) {
+        workerTeamService.removeByIds(ids);
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/zfire/bean/WorkerParamBean.java

@@ -22,4 +22,7 @@ public class WorkerParamBean extends ZfireParamBean {
 
     @ApiModelProperty(value = "结束end时间")
     private String overEndTime;
+
+    @ApiModelProperty(value = "是否忽略网点权限")
+    private Boolean ignoreWebsitRole;
 }