From 23ec27618d5a16005e1323c23e050f7f490df2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 11 Dec 2023 15:17:49 +0800
Subject: [PATCH] fix:79098

---
 .../service/impl/LawsCommonServiceImpl.java   | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 5f7398da..5e33bbf1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -1952,15 +1952,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             selectCondition.append(sql).append(")");
             parameterMap.remove(FieldCommon.BIDDING_COMMITTEE);
         }
-        // 主起草人
-        getSysUserSql(parameterMap, tableName, selectCondition, FieldCommon.MAIN_DRAFTING_USER);
-        // 主起草部门负责人
-        getSysUserSql(parameterMap, tableName, selectCondition, FieldCommon.MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON);
-        // 标准推进人
-        getSysUserSql(parameterMap, tableName, selectCondition, FieldCommon.STANDARD_PROMOTER);
-        // 责任部门负责人
-        getSysUserSql(parameterMap, tableName, selectCondition, FieldCommon.RESPONSIBLE_DEPARTMENT_USER);
-
 
         if (idSearch) {
             String idSql = idSet.stream()
@@ -1987,7 +1978,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             }
             // 如果value不为null和""，则拼接查询条件
             if (StringUtils.isNotBlank(value)) {
-                jointSelectCondition(fieldList, selectCondition, key, value);
+                jointSelectCondition(fieldList, selectCondition, key, value, tableName);
             }
         }
 
@@ -2027,10 +2018,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         return selectCondition.toString();
     }
 
-    private void getSysUserSql(Map<String, Object> parameterMap, String tableName, StringBuilder selectCondition, String field) {
-        String mainDraftingUser = (String) parameterMap.get(field);
-        if (CharSequenceUtil.isNotBlank(mainDraftingUser)) {
-            List<String> strData = Arrays.asList(mainDraftingUser.split(","));
+    private void getSysUserSql(String tableName, StringBuilder selectCondition, String key, String value) {
+        if (CharSequenceUtil.isNotBlank(value)) {
+            List<String> strData = Arrays.asList(value.split(","));
             StringBuilder str = new StringBuilder();
             for (int i = 0; i < strData.size(); i++) {
                 str.append("realname").append(" like '%").append(strData.get(i)).append("%' ");
@@ -2038,10 +2028,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                     str.append(" and ");
                 }
             }
-            String sql = "and exists (select id from sys_user where " + tableName + "." + field + " = id" +
+            String sql = "and exists (select id from sys_user where " + tableName + "." + key + " = id" +
                     " and del_flag = 0 and " + str + ")";
             selectCondition.append(sql);
-            parameterMap.remove(field);
         }
     }
 
@@ -2106,7 +2095,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
      * @Date: 2023/8/25 10:58
      * @Description: 拼接查询条件
      **/
-    private void jointSelectCondition(List<LawsTag> fieldList, StringBuilder selectCondition, String key, String value) {
+    private void jointSelectCondition(List<LawsTag> fieldList, StringBuilder selectCondition, String key, String value, String tableName) {
         for (LawsTag lawsTag : fieldList) {
             String dbFieldName = lawsTag.getDbFieldName();
             if (Objects.equals(key, dbFieldName)) {
@@ -2119,7 +2108,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                     manyOption(selectCondition, key, value);
                 } else if (FieldCommon.TYPE_SIMPLE_OPTION.contains(fieldShowType)) {
                     // 单选
-                    simpleOption(selectCondition, key, value);
+                    // 单选用户弹框
+                    if(Objects.equals(LawsFieldTypeEnum.USER_SINGLE.getValue(),fieldShowType)){
+                        getSysUserSql(tableName,selectCondition, key, value);
+                    }else{
+                        simpleOption(selectCondition, key, value);
+                    }
                 } else if (LawsFieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) {
                     // 单日期查询
                     processDateSingleTypeCondition(selectCondition, key, value);