From abf99aaa51f5d21b6cb0292772dbdcea30744ab8 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 20 Jun 2022 14:50:59 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/organization/entity/extend/bo/ExtendGroupBO.java | 3 +++
 .../engine/organization/entity/extend/bo/ExtendInfoBO.java  | 2 +-
 .../engine/organization/mapper/extend/ExtendInfoMapper.xml  | 1 -
 .../engine/organization/service/impl/ExtServiceImpl.java    | 6 +++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
index 76614a44..9848dd8b 100644
--- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
+++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
@@ -74,6 +74,9 @@ public class ExtendGroupBO {
             case 3:
                 tableName = "JCL_ORG_JOB";
                 break;
+            case 4:
+                tableName = "JCL_ORG_HRMRESOURCE";
+                break;
             default:
                 break;
         }
diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
index 0adfead5..d3ad4d45 100644
--- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
+++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
@@ -174,7 +174,7 @@ public class ExtendInfoBO {
             // 必填
             if (1 == extendInfoPO.getIsrequired()) {
                 fieldItem.setViewAttr(3);
-                fieldItem.setRules("required|string");
+                fieldItem.setRules("required");
             } else {
                 fieldItem.setViewAttr(2);
             }
diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
index 725c17ac..eddb6dca 100644
--- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
@@ -269,7 +269,6 @@
     <select id="getMaxId" resultType="java.lang.Long">
         select max(id)
         from jcl_field_extendinfo
-        order by id desc
     </select>
     <select id="listFieldsByTableName" resultType="java.lang.Object">
         select ${fieldName}
diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java
index 91a68d3f..d4647df1 100644
--- a/src/com/engine/organization/service/impl/ExtServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java
@@ -82,7 +82,7 @@ public class ExtServiceImpl extends Service implements ExtService {
                     item.setViewAttr(1);
                 } else if (1 == extendInfoPO.getIsrequired()) {
                     item.setViewAttr(3);
-                    item.setRules("required|string");
+                    item.setRules("required");
                 }
             }
             conditionItems.add(item);
@@ -194,6 +194,10 @@ public class ExtServiceImpl extends Service implements ExtService {
             if ("int".equals(extendInfoPO.getFieldType()) && StringUtils.isEmpty((String) value)) {
                 value = null;
             }
+
+            if ("text".equals(extendInfoPO.getFieldType()) && null == value) {
+                value = "";
+            }
             map.put(key, value);
         }
         if (null != id) {