修复bug 工程电话错乱bug

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java

@@ -25,7 +25,8 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
     Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto);
     //List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
     List< Map<String,Object>> getuserListByOrgCode(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosOrgCode") String amosOrgCode);
-    List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
+  @UserEmpower(field ={},dealerField ={"hygf_personnel_business.amos_unit_org_code","hygf_personnel_business.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+  List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
 
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")
     List<UnitInfo>   getlistUnitInfo();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PowerStationServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -131,6 +132,7 @@ public class PowerStationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "电站审核",   notes = "电站审核")
 	@PostMapping(value = "/powerStationExamine")
+	@GlobalTransactional
 	public ResponseModel<String> powerStationExamine(@RequestParam(value = "pageId") long pageId,
 														 			@RequestParam(value = "nodeCode") String nodeCode,
 													 				@RequestParam(value = "stationId") String stationId,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -261,6 +262,7 @@ public class UnitInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@PostMapping(value = "/unitRegister")
 	@ApiOperation(httpMethod = "POST", value = "单位注册", notes = "单位注册")
+    @GlobalTransactional
 	public ResponseModel<UnitRegisterDto> save(@RequestBody UnitRegisterDto model) {
 		try {
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -233,7 +233,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 	}
 
 	@Override
-	@GlobalTransactional
 	public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId,
 			String planInstanceId, Map<String, Object> kv) {
 		String meg = "";

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -244,4 +244,10 @@ spring.elasticsearch.rest.uris=http://47.92.234.253:9200
 spring.elasticsearch.rest.connection-timeout=30000
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=123456
+spring.elasticsearch.rest.read-timeout=30000
+## 47环境 排除es报错引进无用配置 业务未实际使用es
+spring.elasticsearch.rest.uris=http://47.92.234.253:9200
+spring.elasticsearch.rest.connection-timeout=30000
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=123456
 spring.elasticsearch.rest.read-timeout=30000
\ No newline at end of file