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

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -22,20 +22,14 @@ public class UserVO   {
     @ZfireField(hide = true)
     private String userId;
 
-    @ZfireField(tbName = "b")
+    @ZfireField(tbName = "c")
     @ApiModelProperty(value = "所属公司")
     private String belongCompany;
 
-    @ZfireField( tbName = "b")
+    @ZfireField( tbName = "c")
     @ApiModelProperty(value = "所属公司编号")
     private String belongCompanyCode;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "所属公司")
-    private String companyWechatName;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "所属公司编号")
-    private String companyWechatId;
 
     @ZfireField(tbName = "b")
     @ApiModelProperty("网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -37,6 +37,9 @@ public class WorkerManagerLogic {
     @Autowired
     UserService userService;
 
+    @Autowired
+    AdminWebsitService adminWebsitService;
+
 
     public void stop(String id) {
 
@@ -156,11 +159,8 @@ public class WorkerManagerLogic {
     @Transactional(rollbackFor = Exception.class)
     public void examineWait(WorkerManagerBean workerManagerBean) {
 
-        //todo 检测保险情况 自建，第三方网点
-
         workerManagerBean.updateById();
 
-
         workerManagerBean.getUser().updateById();
 
         workerImgService.lambdaUpdate().eq(WorkerImg::getWorkerId,workerManagerBean.getUserId())
@@ -185,6 +185,19 @@ public class WorkerManagerLogic {
         workerPolicyService.saveOrUpdateBatch(workerManagerBean.getWorkerPolicies());
 
 
+
+
+        if (workerManagerBean.getExamineStatus().equals(ExamineWorkerStatusEnum.FAIL.getKey()))
+            return;
+
+
+        //todo 检测保险情况 自建，第三方网点
+
+       // adminWebsitService.getById()
+
+
+
+
         //todo 生成工伤/雇主  自建