Browse Source

报销列表BUG修复

anderx 1 year ago
parent
commit
59c18db536

+ 6 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -549,7 +549,12 @@
       </if>
     </if>
     <if test="username != null" >
-      and  a.user_names  like concat('%',#{username},'%')
+        <if test="expenseMain ==0">
+          and  a.user_names  like concat('%',#{username},'%')
+        </if>
+      <if test="expenseMain ==1">
+        and  sea.user_names  like concat('%',#{username},'%')
+      </if>
     </if>
     <if test="startTime !=null and endTime !=null">
       and a.create_time between #{startTime} and #{endTime}

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-static.host=//static.jishutao.com/1.3.10
-#static.host=//172.16.1.187/1.3.10
+#static.host=//static.jishutao.com/1.3.10
+static.host=//172.16.1.187/1.3.10
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20221026?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false