Kaynağa Gözat

营销管理员列表审核更换成部门查询

anderx 7 yıl önce
ebeveyn
işleme
edb7375be1

+ 1 - 1
GeneratorConfig.xml

@@ -4,7 +4,7 @@
   <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" />
    <!-- <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" /> -->
   <context id="context1">	
-    <jdbcConnection connectionURL="jdbc:mysql://192.168.0.17:3306/aft" 
+    <jdbcConnection connectionURL="jdbc:mysql://192.168.0.14:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="aft" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="aft" />

+ 2 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1119,6 +1119,7 @@
   	</if>
   	<if test="specially == 1">
   	and a.process_status =1  and a.order_status=1
+  	and c.department_id=(select department_id from admin where  id= #{aid,jdbcType=VARCHAR})
   	</if>
   	<if test="specially == 2">
   	and a.order_status in(3,5) 
@@ -1183,6 +1184,7 @@
   	</if>
   	<if test="specially == 1">
   	and a.process_status =1  and a.order_status=1
+  	and c.department_id=(select department_id from admin where  id= #{aid,jdbcType=VARCHAR})
   	</if>
   	<if test="specially == 2">
   	and a.order_status in(3,5) 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -274,7 +274,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		if (specially!=null&&(specially==0||specially==2||specially==5)) {
+		if (specially!=null&&(specially==0||specially==1||specially==2||specially==5)) {
 			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		}else if(specially!=null&&specially==4){
 			params.put("distribution",distribution);

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

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc\:mysql\://192.168.0.17\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.url=jdbc\:mysql\://192.168.0.14\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=192.168.0.17
+jedis.host=192.168.0.14
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456