|
|
@@ -1169,12 +1169,13 @@ public class AnalysisDiyCustomerComponent {
|
|
|
if (isManager != 0 && !("019").equals(userOld.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(userOld.getSysUserExt().getCustomerCode().substring(0, 3))
|
|
|
&& !("019").equals(user.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))
|
|
|
) {
|
|
|
- assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
|
|
|
- if (assRelcustomerinfoList != null && assRelcustomerinfoList.size() > 0) {
|
|
|
- log.info("删除用户关联经销商----"+user.getUserId().toString());
|
|
|
- assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(), customerCode);
|
|
|
- }
|
|
|
+
|
|
|
if (user.getSysUserExt().getOrgCode() != null && (!customerCode.equals(userOld.getSysUserExt().getOrgCode()) || !customerCode.equals(userOld.getSysUserExt().getCustomerCode()) )) {
|
|
|
+ assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
|
|
|
+ if (assRelcustomerinfoList != null && assRelcustomerinfoList.size() > 0) {
|
|
|
+ log.info("删除用户关联经销商----"+user.getUserId().toString());
|
|
|
+ assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(), customerCode);
|
|
|
+ }
|
|
|
AssRelcustomerinfo info = new AssRelcustomerinfo();
|
|
|
info.setUserId(userOld.getUserId().toString());
|
|
|
if(!customerCode.equals(userOld.getSysUserExt().getOrgCode())){
|