|
|
@@ -23,7 +23,9 @@ import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
|
|
|
import com.zhongzheng.modules.top.order.mapper.TopOrderBankPayMapper;
|
|
|
import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
|
|
|
import com.zhongzheng.modules.top.order.vo.TopOrderBankPayVo;
|
|
|
+import com.zhongzheng.modules.top.user.domain.TopSysRole;
|
|
|
import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
|
|
|
+import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
|
|
|
import com.zhongzheng.modules.top.user.service.ITopSysUserRoleService;
|
|
|
import com.zhongzheng.modules.user.service.IUserService;
|
|
|
import org.slf4j.Logger;
|
|
|
@@ -63,6 +65,9 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
|
|
|
@Autowired
|
|
|
private ITopDivideLogService iTopDivideLogService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITopSysRoleService iTopSysRoleService;
|
|
|
+
|
|
|
@Value("${oldSys.host}")
|
|
|
private String OLD_SYS_HOST;
|
|
|
|
|
|
@@ -178,7 +183,13 @@ public class TopOrderBankPayServiceImpl extends ServiceImpl<TopOrderBankPayMappe
|
|
|
if(!divideLogFirst.getId().equals(divideLog.getId())){
|
|
|
throw new CustomException("存在历史未支付月份");
|
|
|
}
|
|
|
- if (!bo.getLoginName().equals("admin") ) {
|
|
|
+ TopSysRole sysRole = iTopSysRoleService.getOne(new LambdaQueryWrapper<TopSysRole>()
|
|
|
+ .eq(TopSysRole::getRoleName, "出纳")
|
|
|
+ .eq(TopSysRole::getStatus, 1).last("limit 1"));
|
|
|
+ if(Validator.isEmpty(sysRole)){
|
|
|
+ throw new CustomException("当前系统没有出纳角色");
|
|
|
+ }
|
|
|
+ if (!roleIds.contains(sysRole.getRoleId()) && !bo.getLoginName().equals("admin") ) {
|
|
|
throw new CustomException("当前账号没有审核权限");
|
|
|
}
|
|
|
/*if (!roleIds.contains(checkLog.getRoleId()) && !bo.getLoginName().equals("admin") ) {
|
he2802