Parcourir la source

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

anderx il y a 6 ans
Parent
commit
189a184603

+ 0 - 3
src/main/java/com/goafanti/admin/service/impl/NoticeServiceImpl.java

@@ -70,10 +70,7 @@ public class NoticeServiceImpl extends BaseMybatisDao<NoticeMapper> implements N
 	@Override
 	public int findUnreadNoticeCount() {
 		String aid = null;
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			aid = TokenManager.getAdminId();
-		}
-
 		return noticeMapper.selectUnreadedCount(aid);
 	}
 }

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

@@ -606,6 +606,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 				aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
 			}else {
+				t.setProcessStatus(ProcessStatus.YPWBSH.getCode());
 				for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
 					aids.add(admin.getId());
 				}