Просмотр исходного кода

全部查询接口排除非正常员工,咨询师接口修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
6dad416196

+ 0 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -53,8 +53,6 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	private UserBusinessMapper	userBusinessMapper;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil					passwordUtil;
-	@Autowired
-	private DistrictGlossoryMapper	districtGlossoryMapper;
 	
 	@Override
 	public List<Admin> selectAllAdmin() {

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

@@ -722,7 +722,7 @@
 
   
   <select id="listAdminByName" parameterType="java.lang.String" resultMap="BaseResultMap">
-	select id,name from admin where name like concat('%',#{name},'%')  
+	select id,name from admin where status='正常'  and name like concat('%',#{name},'%')  
   </select>
 
   <!--*************************************************************************-->

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

@@ -507,8 +507,8 @@
 		select
 		name,id
 		from admin
-		where
-		name  like concat('%',#{name,jdbcType=VARCHAR},'%')
+		where status='正常'
+		and name  like concat('%',#{name,jdbcType=VARCHAR},'%')
 	</select>
 	<select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
 	select

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

@@ -1094,7 +1094,7 @@ ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.s
   	left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
     group by task_id) i on a.id=i.task_id left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
-    on a.id=l.tid where  e.delete_sign in (0,1,2)  and e.order_status in (2,4) 
+    on a.id=l.tid where  e.delete_sign in (0,2,3)  and e.order_status in (2,4) 
     and a.outsource= #{outsource,jdbcType=INTEGER}
     <if test="role == 0 ">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
@@ -1158,7 +1158,7 @@ ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.s
   
    <select id="selectOrderTaskListCount" resultType="java.lang.Integer">
   	select  count(*) from t_order_task a  left join t_order_new e on a.order_no=e.order_no
-    left join admin g on e.salesman_id=g.id left join department h on g.department_id=h.id where e.delete_sign in (0,1,2)  and e.order_status in (2,4) 
+    left join admin g on e.salesman_id=g.id left join department h on g.department_id=h.id where e.delete_sign in (0,2,3)  and e.order_status in (2,4) 
     and a.outsource= #{outsource,jdbcType=INTEGER}
    <if test="role == 0 ">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}

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

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200511?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200511?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570
@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.43
+#static.host=//sb.jishutao.com/1.1.44
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.43
+static.host=//static.jishutao.com/1.1.44
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload