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

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/entity/DispatchTask.java

@@ -62,7 +62,7 @@ public class DispatchTask extends BaseEntity {
      * 响应单位id
      */
 	@TableField("response_org_id")
-    private Long responseOrgId;
+    private String responseOrgId;
 
     /**
      * 响应单位名称

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/entity/DispatchTask.java

@@ -62,7 +62,7 @@ public class DispatchTask extends BaseEntity {
      * 响应单位id
      */
 	@TableField("response_org_id")
-    private Long responseOrgId;
+    private String responseOrgId;
 
     /**
      * 响应单位名称

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizByTCMServiceImpl.java

@@ -149,7 +149,9 @@ public class EnterpriseBizByTCMServiceImpl {
 
     public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
         TzBaseEnterpriseInfo tzBaseEnterpriseInfo = enterpriseBizMapper.queryByUseCode(useCode);
-
+        if (ObjectUtils.isEmpty(tzBaseEnterpriseInfo)) {
+            return null;
+        }
         TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = getDetail(tzBaseEnterpriseInfo);
         if (!ObjectUtils.isEmpty(tzBaseEnterpriseInfo)){
             LambdaQueryWrapper<TzsBaseInstitution> lambda = new QueryWrapper<TzsBaseInstitution>().lambda();

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/DispatchTask.java

@@ -62,7 +62,7 @@ public class DispatchTask extends BaseEntity {
      * 响应单位id
      */
 	@TableField("response_org_id")
-    private Long responseOrgId;
+    private String responseOrgId;
 
     /**
      * 响应单位名称

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/DispatchTask.java

@@ -62,7 +62,7 @@ public class DispatchTask extends BaseEntity {
      * 响应单位id
      */
 	@TableField("response_org_id")
-    private Long responseOrgId;
+    private String responseOrgId;
 
     /**
      * 响应单位名称