Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3
This commit is contained in:
+3
-1
@@ -1412,7 +1412,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
// 根据代理人身份证去用户表查询
|
||||
SysUser agentUser = sysUserMapper.selectUserByIdCard(caseApplication.getIdentityNumAgent());
|
||||
// 代理人的部门和申请机构不匹配
|
||||
if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(applicationOrganId)) {
|
||||
if (null!=agentUser && null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(applicationOrganId)) {
|
||||
// return "该申请代理人已在"+agentUser.getDeptName()+"申请机构下存在,请检查填写信息是否正确";
|
||||
if (null != agentUser.getDept() && StrUtil.isNotEmpty(agentUser.getDept().getDeptName())) {
|
||||
failureMsg.append("该申请代理人已在【").append(agentUser.getDept().getDeptName()).append("】申请机构下存在,请检查填写信息是否正确");
|
||||
@@ -2380,6 +2380,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
caseApplicationNew.setClaimPrinciOwed(caseApplicationinsertDiffer.getClaimPrinciOwed());
|
||||
caseApplicationNew.setClaimLiquidDamag(caseApplicationinsertDiffer.getClaimLiquidDamag());
|
||||
caseApplicationNew.setFeePayable(caseApplicationinsertDiffer.getFeePayable());
|
||||
caseApplicationNew.setRequestRule(caseApplicationinsertDiffer.getRequestRule());
|
||||
caseApplicationNew.setProperPreser(caseApplicationinsertDiffer.getProperPreser());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user