Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

@@ -26,14 +26,6 @@ import com.mortals.framework.springcloud.service.IApplicationStartedService;
 import org.springframework.util.ObjectUtils;
 
 import java.util.List;
-
-/**
- * 应用级服务，在应用启动后、停止过程中调用
- * 应用已经完成启动完成，才调用该服务
- * 应用场景：
- * 1、应用任务，应用启动后定时或间隔执行的任务
- * 2、Socket服务端
- */
 @Component
 @Slf4j
 public class DemoStartedService implements IApplicationStartedService {
@@ -56,12 +48,11 @@ public class DemoStartedService implements IApplicationStartedService {
         ThreadPool.getInstance().execute(syncTreeSiteThread);
 
 
-        userService.find(new UserQuery()).forEach(user->{
+/*        userService.find(new UserQuery()).forEach(user->{
             Context context = new Context();
             context.setUser(user);
             ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
-        });
-
+        });*/
 
 /*        if(ObjectUtils.isEmpty(userFeign)){
             logger.info("userFeign未加载,加载本地用户");

base-manager/src/main/java/com/mortals/xhx/module/workman/model/vo/WorkmanVo.java

 package com.mortals.xhx.module.workman.model.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import lombok.Data;
@@ -21,5 +22,6 @@ public class WorkmanVo extends BaseEntityLong {
      * 证件图片附件
      */
     @Excel(name = "证件图片", type = Excel.Type.IMPORT, cellType = Excel.ColumnType.IMAGE)
+    @JSONField(serialize = false)
     private PictureData picObj;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -177,6 +177,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
                     boolean bool = FileUtil.write(filePath, workmanEntity.getPicObj().getData(), true, true);
                     if (bool) {
                         workmanEntity.setPhotoPath(newName);
+                        workmanEntity.setPicObj(null);
                     }
                 } catch (IOException e) {
                     log.error("写入证照异常",e);