Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/SysUserPostDao.xml

@@ -165,7 +165,7 @@
         <if test="userName!= null and userName!= ''">
             and u.name like '%'+#{userName}+'%'
         </if>
-        <if test="deptName.equals('配网技术中心')||deptName.equals('电网技术中心')">
+        <if test="postId ==28">
             and sdi.dept_name = #{deptName}
         </if>
             ORDER BY u.order_code DESC

src/main/resources/templates/annualbudget/add_apply.html

@@ -652,7 +652,7 @@
             searchPlaceholder: '搜索费用名称',
             table: {
                 url: AjaxUtil.ctx + 'staBudgetapproval/getSubNode/' + ysId+'/?searchKey='+tableSelect.searchKey,
-                method: 'post',
+                method: 'get',
                 cols: [
                     [
                         {type: "radio", fixed: 'left'},

src/main/resources/templates/payapply/add.html

@@ -369,7 +369,7 @@
         form.on('submit(saveBtn)', function (data) {
             //合同文件
             var dataWB_Htwj = [];
-            for (const item of dataYszl) {
+            for (const item of dataHtwj) {
                 var dfWb = {
                     "id": item.id,
                     "wjm": item.wjm,