人员数据字典修改

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);