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

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -550,6 +550,17 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(menus);
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/companyTreeByUserAndTypeToPartolCurrent", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据登录人获取公司", notes = "根据登录人获取公司")
+	public ResponseModel<OrgMenuDto> companyTreeByUserAndTypeToPartolCurrent() {
+		// 获取登陆人角色
+		ReginParams reginParams = getSelectedOrgInfo();
+		List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserNumberCurrentNew(reginParams);
+		OrgMenuDto orgMenuDto = menus.get(0);
+		return ResponseHelper.buildResponse(orgMenuDto);
+	}
+
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/companyTreeByUserCurrent", method = RequestMethod.GET)

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2908,6 +2908,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return buildTreeParallel(list);
 	}
 
+	public List<OrgMenuDto> companyTreeByUserNumberCurrentNew(ReginParams reginParams) {
+		Map<String, Object> param = new HashMap<>();
+		// 权限处理
+		param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
+		List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCountNew(param);
+		list = list.stream().filter(e -> e.getBizOrgCode().equals(reginParams.getPersonIdentity().getBizOrgCode())).collect(Collectors.toList());
+		return buildTreeParallel(list);
+	}
+
 	@Override
 	public List<OrgMenuDto> companyTreeByUser(ReginParams reginParams) {
 		Map<String, Object> param = new HashMap<>();

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -478,5 +478,19 @@
     </changeSet>
 
 
+    <changeSet author="tw" id="20221208-2">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="idx_biz_station_info"/>
+        </preConditions>
+        <comment>修改字段</comment>
+        <sql>
+            REPLACE  INTO `idx_biz_station_info`(`name`, `code`, `id`, `warehouse_id`) VALUES ('灵州换流站', 'GW290302', '1559085293783519233', 0);
+
+        </sql>
+    </changeSet>
+
+
+
+
 
 </databaseChangeLog>
\ No newline at end of file