Browse Source

项目暂停与启动审核

anderx 5 months ago
parent
commit
54e5f06c6a

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

@@ -3087,6 +3087,12 @@
         <if test="shiro ==1">
             and c.salesman_id =#{aid}
         </if>
+          <if test="shiro ==2">
+            and c.order_dep in
+              <foreach close=")" collection="myDeps" item="dep" open="(" separator=",">
+                  #{dep}
+              </foreach>
+        </if>
         <if test="deps  !=null">
             and c.order_dep  in
             <foreach close=")" collection="deps" item="dep" open="(" separator=",">
@@ -3145,10 +3151,17 @@
         from task_stop a left join t_order_task b on a.tid=b.id
         left join t_order_new  c on b.order_no =c.order_no
         left join t_order_mid tom on c.order_no =tom.order_no
+
         where 1=1
         <if test="shiro ==1">
             and c.salesman_id =#{aid}
         </if>
+        <if test="shiro ==2">
+            and c.order_dep in
+            <foreach close=")" collection="myDeps" item="dep" open="(" separator=",">
+                #{dep}
+            </foreach>
+        </if>
         <if test="deps  !=null">
             and c.order_dep  in
             <foreach close=")" collection="deps" item="dep" open="(" separator=",">

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -2043,6 +2043,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 			}else  if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
 				params.put("shiro",2);
+				List<String> myDeps = departmentService.selectMyDeps();
+				params.put("myDeps",myDeps);
 			}
 		}else {
 			return new Pagination<>();