Browse Source

营销经理审核列表开发

anderx 3 years ago
parent
commit
4e39ee6018

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

@@ -1157,7 +1157,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
        and mg.manager_id= #{aid}
      </if>
   	<if test="specially == 1">
-  	and a.process_status = 1  and a.order_status = 1
+  	and a.process_status = 2  and a.order_status = 1
   	</if>
   	<if test="specially == 2">
   	and a.order_status in(3,5)

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

@@ -761,7 +761,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN))in.setSpecially(1);
 		else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))in.setSpecially(10);
 		else if (TokenManager.hasRole(AFTConstants.SALESMAN))in.setSpecially(0);
-		if (in.getSpecially()!=null&&(in.getSpecially()==0|| in.getSpecially()==1|| in.getSpecially()==2|| in.getSpecially()==4|| in.getSpecially()==5|| in.getSpecially()==7)) {
+		if (in.getSpecially()!=null&&(in.getSpecially()==0|| in.getSpecially()==1|| in.getSpecially()==2||
+				in.getSpecially()==4|| in.getSpecially()==5|| in.getSpecially()==7|| in.getSpecially()==10)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
 			if (in.getSpecially()!=3&& in.getSpecially()!=4) {
 				if (in.getAid() ==null){