Просмотр исходного кода

部门修改原数据为空处理

anderx 1 год назад
Родитель
Сommit
1bd3db4073

+ 4 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2722,6 +2722,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	private Object pushRetrun(Pagination<?> page) {
 		Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
 		List<CustomerSimpleBo> list = (List<CustomerSimpleBo>) page.getList();
+		//公出权限 0正常 1全部   =1的用户,公出status=0(应该是不用审核)
+		//不然,就是 客户是公共客户   status=2
+		//再不然就是  是我自己的客户就是 status=0
+		//再不然就是status=1  (也就是不是公共客户,也不是我自己的客户,按理是需要审核)
 		list.forEach(e ->{
 			if (admin.getPublicPurview()==1){
 				//如果是白名单不管是不是自己都可以公出

+ 2 - 2
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -230,7 +230,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		//财务与复审切换的时候要切换所有未审核的财务
 		boolean updateFinance=false;
 		boolean updateRetrialFinance=false;
-		if(StringUtils.isNotBlank(in.getFinanceId())&&!useDep.getFinanceId().equals(in.getFinanceId())){
+		if(StringUtils.isNotBlank(in.getFinanceId())&&!in.getFinanceId().equals(useDep.getFinanceId())){
 			dep.setFinanceId(in.getFinanceId());
 			//处理订单
 			departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(),useDep.getFinanceId());
@@ -239,7 +239,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			updateFinance=true;
 		}
 		if (StringUtils.isNotBlank(in.getRetrialFinanceId())&&
-				!useDep.getRetrialFinanceId().equals(in.getRetrialFinanceId())){
+				!in.getRetrialFinanceId().equals(useDep.getRetrialFinanceId())){
 			dep.setRetrialFinanceId(in.getRetrialFinanceId());
 			departmentMapper.updateOrderDepFinanceNotExamine(in.getRetrialFinanceId(),useDep.getRetrialFinanceId());
 			List<String> list = torderNewMapper.selectByFinanceNotExamine(in.getRetrialFinanceId());