Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 2 years ago
parent
commit
c0ac727a5b

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

@@ -569,6 +569,7 @@ from new_order_change a where 1 = 1 and status in (0,1,2,3)
   select count(*) from new_order_change
 	where order_no= #{orderNo} and status in (0,1,2,3,6)
   </select>
+  <!--suppress MybatisPlusMapperXmlInspection -->
   <select id="selectOrderChangeList" resultType="com.goafanti.order.bo.NewOderCahngeListBo">
 	select a.id,a.order_no orderNo,b.contract_no contractNo, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,c.nickname,b.order_type orderType,
   date_format(b.create_time,'%Y-%m-%d %H:%i:%S')establishTimes, b.order_status orderStatus,b.total_amount totalAmount,a.status ,a.examine_name examineName,
@@ -712,6 +713,7 @@ from new_order_change a where 1 = 1 and status in (0,1,2,3)
 	</if>
   </select>
 
+  <!--suppress MybatisPlusMapperXmlInspection -->
   <select id="selectOrderChangeCount" resultType="java.lang.Integer">
   select count(*) from new_order_change noc left join  new_order_change a on noc.id=a.id
   left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id

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

@@ -399,7 +399,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (ib.getOutsourceStatus() !=null) params.put("outsourceStatus", ib.getOutsourceStatus());
 		if (ib.getCid() !=null) params.put("cid", ib.getCid());
 		List<String> fids=new ArrayList<>();
-		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN) ||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+		 if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)){
+			params.put("role", 0);
+			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN) ||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
 				TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
 				TokenManager.hasRole(AFTConstants.VICE_CEO)) {
 			params.put("role", 2);
@@ -411,9 +414,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			params.put("role", 1);
 			 fids.add(TokenManager.getAdminId());
 			 params.put("fids",fids);
-		} else {
-			params.put("role", 0);
-			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		}
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, ib.getPageNo(), ib.getPageSize());
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();

+ 1 - 2
src/main/webapp/WEB-INF/views/admin/login.html

@@ -8,11 +8,10 @@
 </head>
 <body>
 	<div id="root"></div>
-	
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${staticHost+'/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${staticHost+'/admin/login.js'}"></script>
 	</div>
 </body>
-</html>
+</html>