|
@@ -92,7 +92,10 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResponseResultVO updateCurrentCpByWxid(Map<String, Object> map) {
|
|
public ResponseResultVO updateCurrentCpByWxid(Map<String, Object> map) {
|
|
|
String userWxid = map.get("openid") + "";
|
|
String userWxid = map.get("openid") + "";
|
|
|
- Integer cpId = Integer.valueOf(map.get("cpId") + "");
|
|
|
|
|
|
|
+ Integer cpId = null;
|
|
|
|
|
+ if (map.get("cpId") != null) {
|
|
|
|
|
+ cpId = Integer.valueOf(map.get("cpId") + "");
|
|
|
|
|
+ }
|
|
|
int i = userMapper.updateCurrentCpByWxid(userWxid, cpId);
|
|
int i = userMapper.updateCurrentCpByWxid(userWxid, cpId);
|
|
|
return ResponseResultUtil.success(true);
|
|
return ResponseResultUtil.success(true);
|
|
|
}
|
|
}
|
|
@@ -125,7 +128,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
|
|
|
HttpServletRequest request;
|
|
HttpServletRequest request;
|
|
|
if (attributes != null) {
|
|
if (attributes != null) {
|
|
|
request = attributes.getRequest();
|
|
request = attributes.getRequest();
|
|
|
- request.setAttribute("svcCode", company.getSvcCode().replace("_","-"));
|
|
|
|
|
|
|
+ request.setAttribute("svcCode", company.getSvcCode().replace("_", "-"));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 组织机构 -顶级
|
|
// 组织机构 -顶级
|
|
@@ -158,7 +161,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
|
|
|
// 如果没有成功返回,状态设置为待审
|
|
// 如果没有成功返回,状态设置为待审
|
|
|
if (staffResponseResponseResultVO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
|
|
if (staffResponseResponseResultVO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
|
|
|
// 无用户
|
|
// 无用户
|
|
|
- throw new BaseBusinessException(staffResponseResponseResultVO.getCode(),staffResponseResponseResultVO.getMessage());
|
|
|
|
|
|
|
+ throw new BaseBusinessException(staffResponseResponseResultVO.getCode(), staffResponseResponseResultVO.getMessage());
|
|
|
} else {
|
|
} else {
|
|
|
staffResponse = staffResponseResponseResultVO.getData();
|
|
staffResponse = staffResponseResponseResultVO.getData();
|
|
|
}
|
|
}
|