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

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

@@ -29,7 +29,7 @@ public class KeySiteExcleDto implements Serializable {
 	private String name;
 
 	@ExcelProperty(value = "所属单位/部门id", index = 1)
-	@ExplicitConstraint(indexNum = 1,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyList") //固定下拉内容
+	@ExplicitConstraint(indexNum = 1,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyDetailTree") //固定下拉内容
 	@ApiModelProperty(value = "所属单位/部门id")
 	private String belongName;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -328,9 +328,9 @@ public class CommandController extends BaseController {
      * **/
 
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "JQ")
+    @GetMapping(value = "JQ/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询灾情详情", notes = "根据id查询灾情详情")
-    public ResponseModel<Object> selectById( Long id) {
+    public ResponseModel<Object> selectById( @PathVariable Long id) {
 
         return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledKeyValueLabelById(id));
 

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

@@ -974,4 +974,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
   	});  	  
 	  return lidataDtos;
 	}
+	
+	public List<OrgUsr> getCompanyDetailTree() {
+		LambdaQueryWrapper<OrgUsr> wrapper= new LambdaQueryWrapper<OrgUsr>(); 
+		wrapper.eq(OrgUsr::getBizOrgType, "COMPANY");
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		return	this.baseMapper.selectList(wrapper);
+	}
+	
+	
 }
+
+
+	
\ No newline at end of file