Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue

@@ -18,11 +18,25 @@
               <el-form-item label="收款银行:" class="searchlist">
                 <el-input v-model="listQuery.params.collectionBank" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="收款金额:" class="searchlist">
+                <el-input v-model="listQuery.params.collectionMoney" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="收款日期:" class="searchlist">
                 <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.collectionStartDate" clearable style="width: 160px" type="date" placeholder="开始日期"/>
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.collectionEndDate" clearable style="width: 160px" type="date" placeholder="结束日期"/>
               </el-form-item>
+              <el-form-item label="申请部门:" class="searchlist">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人:" class="searchlist">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期:" class="searchlist">
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.createStartDate" clearable style="width: 160px" type="date" placeholder="开始日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.createEndDate" clearable style="width: 160px" type="date" placeholder="结束日期"/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
@@ -209,6 +223,11 @@ export default {
         size: 10,
         params: {
           payerName: '',
+          createDept: '',
+          createByName: '',
+          createStartDate: '',
+          createEndDate: '',
+          collectionMoney: '',
           collectionStartDate: '',
           collectionEndDate: '',
           collectionBank: '',
@@ -304,7 +323,12 @@ export default {
           useOrgSid: '',
           createBySid: '',
           state: '',
-          orgPath: ''
+          orgPath: '',
+          createDept: '',
+          createByName: '',
+          createStartDate: '',
+          createEndDate: '',
+          collectionMoney: ''
         },
         total: 0
       }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -131,9 +131,9 @@
         SELECT su.*
         FROM sys_user su
         left join sys_staffinfo si on si.sid = su.staffSid
-        where appId = #{appId}
-          and isDelete = 0
-          and userType = 1 and si.personTypeKey != '01'
+        where su.appId = #{appId}
+          and su.isDelete = 0
+          and su.userType = 1 and si.personTypeKey != '01'
     </select>
     <select id="fetchByUserName" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         SELECT *