diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java
index 47fd7777b4..169fe63da3 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java
@@ -69,5 +69,10 @@ public class IcExportItemListFormDTO implements Serializable {
*/
private String optionSourceType;
+ /**
+ * 是否支持添加(即多对一,eg:需求列表)
+ */
+ private boolean supportAdd;
+
}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemBaseResult.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemBaseResult.java
index 737940aec9..c8707fcbc1 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemBaseResult.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemBaseResult.java
@@ -55,5 +55,10 @@ public class FormItemBaseResult implements Serializable {
*/
private String optionSourceValue;
+ /**
+ * 是否支持添加(即多对一,eg:需求列表)
+ */
+ private boolean supportAdd;
+
}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
index ff9dfa2bc7..b58666f21c 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
@@ -252,6 +252,7 @@
ifi.OPTION_SOURCE_VALUE,
ifi.OPTION_SOURCE_TYPE,
ifig.TABLE_NAME,
+ ifig.SUPPORT_ADD,
CONCAT(ifi.COLUMN_NAME, if(ifi.COLUMN_NUM = 0, '', ifi.COLUMN_NUM)) columnName
FROM
ic_form_item ifi
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 46a6da5f6a..ddcf858287 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -812,6 +812,7 @@
AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
+ ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk)
) t
WHERE
1=1
@@ -821,7 +822,7 @@
AND natCount = #{natCount}
- ORDER BY `NAME`
+