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

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

@@ -142,8 +142,13 @@ public class OrgDepartmentController {
         List<AlertFormValue> list = iAlertFromValueService.list(queryWrapper);
         List<FormValue> formValue = new ArrayList<FormValue>();
         for (AlertFormValue alertFormValue : list) {
-            FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.isBlock());
-            formValue.add(value);
+            if (alertFormValue.getFieldValueCode() == null){
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.isBlock());
+                formValue.add(value);
+            }else {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.isBlock());
+                formValue.add(value);
+            }
         }
         OrgDepartmentFormVo orgDepartmentFormVo = new OrgDepartmentFormVo();
         BeanUtils.copyProperties(orgUsr,orgDepartmentFormVo);

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

@@ -142,8 +142,13 @@ public class OrgPersonController {
         List<AlertFormValue> list = iAlertFromValueService.list(queryWrapper);
         List<FormValue> formValue = new ArrayList();
         for (AlertFormValue alertFormValue : list) {
-            FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.isBlock());
-            formValue.add(value);
+            if (alertFormValue.getFieldValueCode() == null){
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.isBlock());
+                formValue.add(value);
+            }else {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.isBlock());
+                formValue.add(value);
+            }
         }
         OrgPersonFormVo orgUsrFormVo = new OrgPersonFormVo();
         BeanUtils.copyProperties(orgUsr,orgUsrFormVo);

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

@@ -145,8 +145,13 @@ public class OrgUsrController extends BaseController {
         List<AlertFormValue> list = iAlertFromValueService.list(queryWrapper);
         List<FormValue> formValue = new ArrayList();
         for (AlertFormValue alertFormValue : list) {
-            FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.isBlock());
-            formValue.add(value);
+            if (alertFormValue.getFieldValueCode() == null){
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.isBlock());
+                formValue.add(value);
+            }else {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.isBlock());
+                formValue.add(value);
+            }
         }
         OrgUsrFormVo orgUsrFormVo = new OrgUsrFormVo();
         orgUsrFormVo.setDynamicFormAlert(formValue);

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,7 +78,6 @@ 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;
     }
@@ -132,7 +131,9 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         //子集的间接子对象
         for (OrgMenuVo entity : childList) {
             entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
-
+            if (entity.getChildren() != null){
+                entity.setLeaf(false);
+            }
         }
 
         //递归退出条件
@@ -152,8 +153,23 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
             // 查询出单位基本信息
             OrgUsr company = getById(ids.get(i));
             resultMap.put("id", company.getSequenceNbr());
+            // 上级单位
             resultMap.put("upUnit", selectUpUnitByParam(company.getBizOrgCode()));
+            // 当前单位
             resultMap.put("currentUnit", company.getBizOrgName());
+            // 下级单位
+            Map<String, Object> downUnitColumnMap = new HashMap<>();
+            downUnitColumnMap.put("is_delete", CommonConstant.IS_DELETE_00);
+            downUnitColumnMap.put("biz_org_type",CommonConstant.BIZ_ORG_TYPE_COMPANY);
+            downUnitColumnMap.put("parent_id",company.getSequenceNbr());
+            QueryWrapper downUnitWrapper = new QueryWrapper<OrgUsr>();
+            downUnitWrapper.allEq(downUnitColumnMap);
+            List <OrgUsr> downList  = list(downUnitWrapper);
+            if (downList.size() == 0){
+                resultMap.put("downUnit", false);
+            }else {
+                resultMap.put("downUnit", true);
+            }
             // 人员数量
             Map<String, Object> countPerson = new HashMap<>();
             countPerson.put("parent_id", company.getSequenceNbr());