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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/constants/CommonConstant.java

@@ -29,10 +29,10 @@ public interface CommonConstant {
 	/**
 	 * 未被删除
 	 */
-	public final static String IS_DELETE_00 = "0";
+	public final static boolean IS_DELETE_00 = false;
 
 	/**
 	 *  已被删除
 	 */
-	public final static String IS_DELETE_01 = "1";
+	public final static boolean IS_DELETE_01 = true;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgDepartmentFormVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+* 机构/部门/人员表
+*
+* @author tb
+* @date 2021-06-18
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+@ApiModel(value="OrgUsrVo", description="人员信息")
+public class OrgDepartmentFormVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "机构/部门id")
+    private Long id;
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+
+    @ApiModelProperty(value = "动态表单值")
+    private List<FormValue> dynamicFormAlert;
+
+    public OrgDepartmentFormVo() {
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgMenuVo.java

@@ -18,23 +18,22 @@ public class OrgMenuVo {
     public Long key;
     public String title;
     public Long parentId;
-    public boolean isLeaf;
+    public boolean leaf = true;
     public List<OrgMenuVo> children;
     public String bizOrgType;
-    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType, boolean isLeaf) {
+    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType, boolean leaf) {
         super();
         this.key = key;
         this.title = title;
         this.parentId = parentId;
         this.bizOrgType = bizOrgType;
-        this.isLeaf = isLeaf;
+        this.leaf = leaf;
     }
 
-    public OrgMenuVo(Long key, String title, Long parentId, boolean isLeaf, List<OrgMenuVo> children, String bizOrgType) {
+    public OrgMenuVo(Long key, String title, Long parentId, String bizOrgType) {
         this.key = key;
         this.title = title;
         this.parentId = parentId;
-        this.isLeaf = isLeaf;
         this.children = children;
         this.bizOrgType = bizOrgType;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonFormVo.java

@@ -51,19 +51,6 @@ public class OrgPersonFormVo {
     @ApiModelProperty(value = "动态表单值")
     private List<FormValue> dynamicFormAlert;
 
-    public OrgPersonFormVo(String bizOrgName, String parentId, List<FormValue> dynamicFormAlert) {
-        this.bizOrgName = bizOrgName;
-        this.parentId = parentId;
-        this.dynamicFormAlert = dynamicFormAlert;
-    }
-
-    public OrgPersonFormVo(Long id, String bizOrgName, String parentId, List<FormValue> dynamicFormAlert) {
-        this.id = id;
-        this.bizOrgName = bizOrgName;
-        this.parentId = parentId;
-        this.dynamicFormAlert = dynamicFormAlert;
-    }
-
     public OrgPersonFormVo() {
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonVo.java

@@ -25,14 +25,34 @@ public class OrgPersonVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "人员基本信息")
-    private  OrgUsr orgUsr;
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
 
     @ApiModelProperty(value = "动态表单值")
     private List<AlertFormValue> alertFormValue;
 
-    public OrgPersonVo(OrgUsr orgUsr, List<AlertFormValue> alertFormValue) {
-    	this.orgUsr = orgUsr;
-        this.alertFormValue = alertFormValue;
+    public OrgPersonVo() {
     }
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrFormVo.java

@@ -39,23 +39,6 @@ public class OrgUsrFormVo {
     @ApiModelProperty(value = "单位人员信息值")
     private List<OrgPersonFormVo> children;
 
-    public OrgUsrFormVo(String currentUnit, String parentId, Integer personNum, List<FormValue> dynamicFormAlert, List<OrgPersonFormVo> children) {
-        this.currentUnit = currentUnit;
-        this.parentId = parentId;
-        this.personNum = personNum;
-        this.dynamicFormAlert = dynamicFormAlert;
-        this.children = children;
-    }
-
-    public OrgUsrFormVo(Long id, String currentUnit, String parentId, Integer personNum,  List<FormValue> dynamicFormAlert, List<OrgPersonFormVo> children) {
-        this.id = id;
-        this.currentUnit = currentUnit;
-        this.parentId = parentId;
-        this.personNum = personNum;
-        this.dynamicFormAlert = dynamicFormAlert;
-        this.children = children;
-    }
-
     public OrgUsrFormVo() {
     }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgUsrVo.java

@@ -50,15 +50,4 @@ public class OrgUsrVo {
     @ApiModelProperty(value = "单位动态表单值")
     private List<AlertFormValue> alertFormValue;
 
-    public OrgUsrVo(String bizOrgName, String bizOrgCode, String amosOrgId, String amosOrgCode, String bizOrgType, String buildName, String buildId, String parentId, List<AlertFormValue> alertFormValue) {
-        this.bizOrgName = bizOrgName;
-        this.bizOrgCode = bizOrgCode;
-        this.amosOrgId = amosOrgId;
-        this.amosOrgCode = amosOrgCode;
-        this.bizOrgType = bizOrgType;
-        this.buildName = buildName;
-        this.buildId = buildId;
-        this.parentId = parentId;
-        this.alertFormValue = alertFormValue;
-    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgDepartmentController.java

@@ -13,6 +13,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,10 +109,10 @@ public class OrgDepartmentController {
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
     public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) {
+        // 修改人员信息
         OrgUsr orgUsr = new OrgUsr();
-        BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
-        // 单位新增情况
-        iOrgUsrService.save(orgUsr);
+        BeanUtils.copyProperties(OrgDepartmentVo,orgUsr);
+        iOrgUsrService.updateById(orgUsr);
         // 动态表单
         List<AlertFormValue> alertFromValuelist = OrgDepartmentVo.getAlertFormValue();
         // 填充主键
@@ -119,7 +120,7 @@ public class OrgDepartmentController {
             alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
         });
         // 保存动态表单数据
-        iAlertFromValueService.saveBatch(alertFromValuelist);
+        iAlertFromValueService.updateBatchById(alertFromValuelist);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -133,7 +134,7 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取部门详情", notes = "获取部门详情")
-    public ResponseModel<OrgUsrFormVo> selectById(HttpServletRequest request, @PathVariable Long id) {
+    public ResponseModel<OrgDepartmentFormVo> selectById(HttpServletRequest request, @PathVariable Long id) {
         QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
         OrgUsr orgUsr = iOrgUsrService.getById(id);
         queryWrapper.eq("alert_called_id", id);
@@ -144,33 +145,12 @@ public class OrgDepartmentController {
             FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.isBlock());
             formValue.add(value);
         }
-        OrgUsrFormVo orgUsrFormVo = new OrgUsrFormVo();
-        BeanUtils.copyProperties(orgUsr,orgUsrFormVo);
-        orgUsrFormVo.setDynamicFormAlert(formValue);
-        return ResponseHelper.buildResponse(orgUsrFormVo);
+        OrgDepartmentFormVo orgDepartmentFormVo = new OrgDepartmentFormVo();
+        BeanUtils.copyProperties(orgUsr,orgDepartmentFormVo);
+        orgDepartmentFormVo.setDynamicFormAlert(formValue);
+        return ResponseHelper.buildResponse(orgDepartmentFormVo);
     }
 
-
-    /**
-     * 根据bizOrgType分页查询
-     *
-     * @param bizOrgType
-     * @return
-     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
-    public IPage<OrgUsr> bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) {
-        Page<OrgUsr> pageBean = new Page<>();
-        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
-        } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        }
-        return iOrgUsrService.page(pageBean, new QueryWrapper<OrgUsr>().eq("biz_org_type", bizOrgType));
-    }
-
-
     /**
      * 获取部门树
      *
@@ -236,51 +216,6 @@ public class OrgDepartmentController {
         return page;
     }
 
-//    /**
-//     * 导入部门信息
-//     *
-//     * @return
-//     */
-//    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-//    @RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
-//    @ApiOperation(httpMethod = "POST", value = "导入部门信息", notes = "导入部门信息")
-//    public ResponseModel saveDepartment(HttpServletRequest request, @RequestBody OrgDepartment orgDepartment, @PathVariable Long id) {
-//        // 导入部门信息的前提条件：单位信息已经存在
-//        if (iOrgUsrService.getById(id) == null) {
-//            return CommonResponseUtil.failure("单位信息需存在才可导入部门信息");
-//        }
-//        if (orgDepartment.getBizOrgType().equals(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT)) {
-//            orgUsr.setBizOrgType(type);
-//            iOrgUsrService.save(orgUsr);
-//            // 动态表单
-//            List<AlertFormValue> alertFromValuelist = OrgUsrVo.getAlertFormValue();
-//            // 填充主键
-//            alertFromValuelist.stream().forEach(alertFromValue -> {
-//                alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
-//            });
-//            // 保存动态表单数据
-//            iAlertFromValueService.saveBatch(alertFromValuelist);
-//            return ResponseHelper.buildResponse();
-//        }
-//        return CommonResponseUtil.failure("机构类型需为部门");
-//    }
-
-//    /**
-//     * 获取部门列表
-//     *
-//     * @param orgCode
-//     * @return
-//     */
-//    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-//    @RequestMapping(value = "/{orgCode}/users", method = RequestMethod.GET)
-//    @ApiOperation(httpMethod = "GET", value = "获取部门人员列表", notes = "获取部门人员列表")
-//    public ResponseModel<Collection<OrgUsr>> selectUsersByOrgCode(HttpServletRequest request,@PathVariable Long orgCode) {
-//        Map<String, Object> columnMap = new HashMap<>();
-//        columnMap.put("biz_org_code", orgCode);
-//        columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
-//        columnMap.put("is_delete",CommonConstant.IS_DELETE_00);
-//         return  ResponseHelper.buildResponse(iOrgUsrService.listByMap(columnMap));
-//    }
     /**
      * 导出部门模板
      *
@@ -289,7 +224,7 @@ public class OrgDepartmentController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "download-template/{type}", method = RequestMethod.POST)
+    @RequestMapping(value = "download-template/", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "根据类型导出模板", notes = "根据类型导出模板")
     public ResponseModel<Object> downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgPersonController.java

@@ -52,7 +52,7 @@ import org.springframework.beans.BeanUtils;
  * @date 2021-06-21.
  */
 @RestController
-@Api(tags = "人员表Api")
+@Api(tags = "人员Api")
 @RequestMapping(value = "/org-person")
 public class OrgPersonController {
     @Autowired
@@ -69,7 +69,8 @@ public class OrgPersonController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo) {
-        OrgUsr orgUsr = OrgPersonVo.getOrgUsr();
+        OrgUsr orgUsr = new OrgUsr() ;
+        BeanUtils.copyProperties(OrgPersonVo,orgUsr);
         // 单位新增情况
         iOrgUsrService.save(orgUsr);
         // 动态表单
@@ -107,9 +108,19 @@ public class OrgPersonController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr, @PathVariable Long id) {
-        // 修改单位信息
+    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo, @PathVariable Long id) {
+        // 修改人员信息
+        OrgUsr orgUsr = new OrgUsr();
+        BeanUtils.copyProperties(OrgPersonVo,orgUsr);
         iOrgUsrService.updateById(orgUsr);
+        // 动态表单
+        List<AlertFormValue> alertFromValuelist = OrgPersonVo.getAlertFormValue();
+        // 填充主键
+        alertFromValuelist.stream().forEach(alertFromValue -> {
+            alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
+        });
+        // 保存动态表单数据
+        iAlertFromValueService.updateBatchById(alertFromValuelist);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -140,27 +151,6 @@ public class OrgPersonController {
         return ResponseHelper.buildResponse(orgUsrFormVo);
     }
 
-
-    /**
-     * 根据bizOrgType分页查询
-     *
-     * @param bizOrgType
-     * @return
-     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
-    public ResponseModel bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) {
-        Page<OrgUsr> pageBean = new Page<>();
-        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
-        } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        }
-        return ResponseHelper.buildResponse(iOrgUsrService.page(pageBean, new QueryWrapper<OrgUsr>().eq("biz_org_type", bizOrgType)));
-    }
-
-
     /**
      * 获取人员树
      *
@@ -252,10 +242,11 @@ public class OrgPersonController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "download-template", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "导出人员模板", notes = "导出人员模板")
-    public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
+    @RequestMapping(value = "/download-template", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "导出人员模板", notes = "导出人员模板")
+    public ResponseModel downloadTemplate(HttpServletResponse response) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
+        List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO = new ArrayList<>();
         ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
         return ResponseHelper.buildResponse(null);
     }

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

@@ -111,9 +111,19 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsr orgUsr, @PathVariable Long id) {
+    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo, @PathVariable Long id) {
         // 修改单位信息
+        OrgUsr orgUsr = new OrgUsr();
+        BeanUtils.copyProperties(OrgUsrVo,orgUsr);
         iOrgUsrService.updateById(orgUsr);
+        // 动态表单
+        List<AlertFormValue> alertFromValuelist = OrgUsrVo.getAlertFormValue();
+        // 填充主键
+        alertFromValuelist.stream().forEach(alertFromValue -> {
+            alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
+        });
+        // 保存动态表单数据
+        iAlertFromValueService.updateBatchById(alertFromValuelist);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -155,13 +165,19 @@ public class OrgUsrController extends BaseController {
     @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
     public ResponseModel bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) {
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
+        columnMap.put("biz_org_type", bizOrgType);
         Page<OrgUsr> pageBean = new Page();
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        return ResponseHelper.buildResponse(iOrgUsrService.page(pageBean, new QueryWrapper<OrgUsr>().eq("biz_org_type", bizOrgType)));
+        QueryWrapper queryWrapper = new QueryWrapper<OrgUsr>();
+        queryWrapper.allEq(columnMap);
+        queryWrapper.orderByAsc("sequence_nbr");
+        return ResponseHelper.buildResponse(iOrgUsrService.page(pageBean,queryWrapper ));
     }
 
 

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

@@ -208,7 +208,7 @@ public class ESAlertCalledService {
     		AlertStatusEnum alertStatusEnum = AlertStatusEnum.getEnum(status);
     		if (!ValidationUtil.isEmpty(alertStatusEnum))
 			{
-    			qb0.should(QueryBuilders.termQuery("alertStatusStr.keyword", alertStatusEnum.getName()));
+    			qb0.should(QueryBuilders.termQuery("alertStatusStr.keyword", alertStatusEnum.getCode()));
 			}
 		}
     	boolMust.must(qb0);

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

@@ -78,8 +78,8 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         //获取每个顶层元素的子数据集合
         for (OrgMenuVo entity : resultList) {
             entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
+            entity.setLeaf(false);
         }
-
         return resultList;
     }
 
@@ -89,7 +89,6 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         List<OrgMenuVo> childList=new ArrayList<>();
         @SuppressWarnings("rawtypes")
 		Class clazz=  Class.forName(packageURL);
-
         Method IDMethodNameme = null;
         switch (IDHierarchy) {
             case 1:
@@ -118,12 +117,12 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
 
             if (parentId == null) {
                 if (topId == parentId) {
-                    OrgMenuVo menu = new OrgMenuVo(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
+                    OrgMenuVo menu = new OrgMenuVo(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
                     childList.add(menu);
                 }
             } else {
                 if (topId.longValue() == parentId.longValue()) {
-                    OrgMenuVo menu = new OrgMenuVo(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)), true);
+                    OrgMenuVo menu = new OrgMenuVo(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
                     childList.add(menu);
                 }
             }
@@ -133,6 +132,7 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         //子集的间接子对象
         for (OrgMenuVo entity : childList) {
             entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
+
         }
 
         //递归退出条件
@@ -187,7 +187,7 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
                     QueryWrapper wrapper = new QueryWrapper<AlertFormValue>();
                     wrapper.eq("alert_called_id",orgUsr.getSequenceNbr());
                     if ( alertFormValueServiceImpl.list(wrapper).size() == 0 ){
-                        personMap.put("zhiweii",null);
+                        personMap.put("administrativePositionCode",null);
                         personMap.put("tel", null);
                         personMap.put("img", null);
                         personList.add(personMap);
@@ -195,11 +195,11 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
                         // 查询动态表单zhiwei
                         Map<String, Object> zhiwei = new HashMap<String, Object>();
                         zhiwei.put("alert_called_id", orgUsr.getSequenceNbr());
-                        zhiwei.put("field_code", "internalPosition");
+                        zhiwei.put("field_code", "administrativePositionCode");
                         QueryWrapper zhiweiWrapper = new QueryWrapper<AlertFormValue>();
                         zhiweiWrapper.allEq(zhiwei);
                         AlertFormValue zhiweiValue = alertFormValueServiceImpl.getOne(zhiweiWrapper);
-                        personMap.put("zhiwu", zhiweiValue.getFieldValue());
+                        personMap.put("administrativePositionCode", zhiweiValue.getFieldValue());
                         // 查询动态表单Phone
                         Map<String, Object> personPhone = new HashMap<String, Object>();
                         personPhone.put("alert_called_id", orgUsr.getSequenceNbr());