Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteDto.java

@@ -106,4 +106,9 @@ public class KeySiteDto  extends BaseDto implements Serializable{
     @ApiModelProperty(value = "机构编码")
     private String bizOrgCode;
 
+    /**
+     * 责任人code
+     */
+    private String chargePersonCode;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/KeySite.java

@@ -151,6 +151,11 @@ public class KeySite extends BaseEntity {
     private Double latitude;
 
     /**
+     * 责任人code
+     */
+    private String chargePersonCode;
+
+    /**
      * 机构/部门名称
      */
     private String bizOrgName;

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

@@ -228,13 +228,18 @@ public class KeySiteController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司树", notes = "根据登录人及类型获取公司树")
-    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType() {
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(String type) {
         // 获取登陆人角色
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
-        return ResponseHelper.buildResponse(menus);
+        if("all".equals(type)) {
+            List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null);
+            return ResponseHelper.buildResponse(menus);
+        } else {
+            List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+            return ResponseHelper.buildResponse(menus);
+        }
     }
 
 }

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2660,6 +2660,17 @@
             alter table `cb_org_usr` add column `code` varchar(255) DEFAULT NULL COMMENT '唯一编号';
         </sql>
     </changeSet>
+    <changeSet author="litengwei" id="2022-1-19-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_key_site" columnName="charge_person_code"/>
+            </not>
+        </preConditions>
+        <comment>cb_key_site add column charge_person_code 责任人code</comment>
+        <sql>
+            ALTER TABLE cb_key_site ADD charge_person_code varchar(100) NULL COMMENT '责任人code';
+        </sql>
+    </changeSet>
 
 
     <changeSet author="tw" id="2022-0119">