修改资源授权

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -161,7 +161,7 @@ public class ControllerAop {
         if(companyM.getRegionSeq()!=null) 
         {
         	FeignClientResult<RegionModel> result =  Systemctl.regionClient.getRegion(Long.valueOf(companyM.getRegionSeq()));
-        	company.setRegionCode(result.getResult().getRegionCode());
+        	company.setRegionCode(String.valueOf(result.getResult().getRegionCode()));
         }
         Bean.copyExistPropertis(roleM, role);
         ReginParams reginParams = new ReginParams();

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/CompanyBo.java

@@ -19,7 +19,7 @@ public class CompanyBo {
     private String orgCode;
     private Long parentId;
     private Long sequenceNbr;
-    private Integer regionCode;
+    private String regionCode;
     private List<CompanyBo> children;
 
     public String getAddress() {
@@ -118,11 +118,11 @@ public class CompanyBo {
         this.children = children;
     }
 
-	public Integer getRegionCode() {
+	public String getRegionCode() {
 		return regionCode;
 	}
 
-	public void setRegionCode(Integer regionCode) {
+	public void setRegionCode(String regionCode) {
 		this.regionCode = regionCode;
 	}
     

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzsJgMapper.xml

@@ -20,9 +20,9 @@
 		produce.factory_num,
 		CONCAT(use1.province,'/',use1.city,'/',use1.county)AS area,
 		use1.address
-		FROM tz_jg_supervise_info supervise
+		FROM 	tz_jg_use_info use1  
 		LEFT JOIN
-		tz_jg_use_info use1 ON use1.sequence_code =
+		tz_jg_supervise_info supervise  ON use1.sequence_code =
 		supervise.sequence_code
 		LEFT JOIN tz_jg_maintenance_info maintenance ON
 		maintenance.sequence_code

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

@@ -57,7 +57,7 @@ public class ESAlertCalledService {
 	public void init() throws Exception
 	{
 		//初始化ES，重建索引
-		//initEs();
+		initEs();
 	}
 
     /**