人员查询接口修改

applications/architecture-dee/src/commonComponents/components/GeneralUserSelect/index.vue

@@ -19,7 +19,7 @@
       <el-option
         v-for="citem in UserData"
         :key="citem.id"
-        :label="citem.name"
+        :label="citem.name+'('+citem.userAccount+')'"
         :value="basicData.subTypeName==='ScrapNoticeDoc'?`${citem.name}(${citem.userAccount})`:citem.id"
       />
     </el-select>
@@ -27,7 +27,8 @@
 </template>
 
 <script>
-import { getUsersByAccount, getFuzzyMatchUser } from '@/api/user'
+import { getFuzzyMatchUser } from '@/api/user'
+import { post } from '@/utils/http'
 import config from './config'
 export default {
   name: 'GeneralUserSelect',
@@ -157,14 +158,63 @@ export default {
             })
         } else {
           // 针对非审计页面查人
-          const params = { userAccount: query, containInnerUser: this.item.containInnerUse || false }
+          // const params = { userAccount: query, containInnerUser: this.item.containInnerUse || false }
+          // if (this.item.secret) {
+          //   params.secretCode = this.$store.state.user.userInfo.secretCode
+          // }
+          const params = {
+            'pageFrom': 1,
+            'pageSize': 200,
+            'openProps': [],
+            'sortItem': [
+              {
+                'fieldName': 'modifyTime',
+                'sortOrder': 'desc'
+              }
+            ],
+            'searchItems': {
+              'operator': 'AND',
+              'children': [
+                {
+                  'items': [
+                    {
+                      'fieldName': 'userAccount',
+                      'operator': 'LIKE',
+                      'value': query
+                    },
+                    {
+                      'fieldName': 'name',
+                      'operator': 'LIKE',
+                      'value': query
+                    }
+                  ],
+                  'operator': 'OR'
+                },
+                {
+                  'items': [
+                    {
+                      'fieldName': 'enableFlag',
+                      'operator': 'EQ',
+                      'value': true
+                    }
+                  ],
+                  'operator': 'AND'
+                }
+              ]
+            }
+          }
           if (this.item.secret) {
-            params.secretCode = this.$store.state.user.userInfo.secretCode
+            // params.secretCode = this.$store.state.user.userInfo.secretCode
+            params.searchItems.items.push({
+              'fieldName': 'secretCode',
+              'operator': 'EQ',
+              'value': this.$store.state.user.userInfo.secretCode
+            },)
           }
           this.loading = true
-          getUsersByAccount(params)
+          post('/DxUserInfo/search', params)
             .then(res => {
-              this.UserData = res.items ? res.items : []
+              this.UserData = res.items && res.items.content ? res.items.content : []
             })
             .finally(() => {
               this.loading = false