Browse Source

Merge branch 'test'

anderx 2 years ago
parent
commit
c47085fa7e

+ 5 - 3
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -329,9 +329,11 @@ public class AdminCustomerApiController extends BaseApiController{
 			res.getError().add(buildError("","创建客户参数不全"));
 			return res;
 		}
-		if (customerService.checkMax(null,TokenManager.getAdminId())) {
-			res.getError().add(buildError("","私有客户已达最大限制"));
-			return res;
+		if (!customerService.checkAid(TokenManager.getAdminId(),Integer.valueOf(AFTConstants.CUSTOMER_SERVICE_SALESMAN))){
+			if (customerService.checkMax(null,TokenManager.getAdminId())) {
+				res.getError().add(buildError("","私有客户已达最大限制"));
+				return res;
+			}
 		}
 		if (customerService.checkOrgCode(in.getOrgCode())){
 			res.getError().add(buildError("","统一信用代码已存在"));

+ 6 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -484,6 +484,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}else {
 			tOrderHighTechMapper.deleteByOrderNo(t.getOrderNo());
 		}
+		//如果修改了部门she审核财务也要切换
+		if(!t.getOrderDep().equals(t2.getOrderDep())) {
+			tOrderExamineMapper.deleteByOrderNo(t.getOrderNo());
+			addOrderExamine(t);
+		}
 		//订单提交
 		if (isSubmit==1) {
 			t2.setApproval(t.getApproval());
@@ -527,11 +532,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				contractNoReplace(t.getOrderNo(), t2.getContractNo(),t2.getOrderDep());
 				createContractNo(t);
 			}
-			//如果修改了部门she审核财务也要切换
-			if(!t.getOrderDep().equals(t2.getOrderDep())) {
-				tOrderExamineMapper.deleteByOrderNo(t.getOrderNo());
-				addOrderExamine(t);
-			}
+
 			// 修改订单中间表信息
 			t.setBuyerId(t2.getBuyerId());
 			updateOrderMid(t);