diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisArticleController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisArticleController.java index dc0391948..53395f5e1 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisArticleController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisArticleController.java @@ -54,7 +54,6 @@ public class EmisArticleController extends BaseController @Autowired private IEmisArticleLikeRecordService emisArticleLikeRecordService; - /** * 查询文章管理列表 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java index 9fbae06f6..60c13c9b2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java @@ -44,6 +44,7 @@ public interface EmisCustomerUserMapper extends BaseMapper */ public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser); + /** * 修改 * @@ -94,4 +95,7 @@ public interface EmisCustomerUserMapper extends BaseMapper public EmisCustomerUser selectMonthCustomerByMonthlyPayCode(String monthlyPayCode); + public int insertSysOmsUserRole(Long omsUserId); + + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 41def9d66..6d0a3f94f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -2498,6 +2498,7 @@ public class EmisBaseService { if(StringUtils.isEmpty(siteCode)){ siteCode="88888"; } + String customerCode=genCustomerCode(); crt.setCustomerCode(customerCode); crt.setOwnerSite(siteCode); @@ -2537,6 +2538,9 @@ public class EmisBaseService { oldUser.setDelFlag("0"); emisCustomerUserMapper.updateEmisCustomerUser(oldUser); + // 插入角色 + emisCustomerUserMapper.insertSysOmsUserRole(oldUser.getId()); + } redissonService.unlock("EMIS_CREATE_USER_LOCK"); return oldUser; @@ -2554,12 +2558,16 @@ public class EmisBaseService { emisCustomerUser.setCustomerCode(customerCode); emisCustomerUser.setOwnerSite(siteCode); emisCustomerUser.setUserName(emisCustomerUser.getCustomerCode()); -// emisCustomerUser.setCustomerType("1"); -// emisCustomerUser.setSettledType("1"); -// emisCustomerUser.setUserType("1"); + emisCustomerUser.setCustomerType("1"); + emisCustomerUser.setSettledType("1"); + emisCustomerUser.setUserType("1"); emisCustomerUser.preInsert(); emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser); + + // 插入角色 + emisCustomerUserMapper.insertSysOmsUserRole(emisCustomerUser.getId()); + redissonService.unlock("EMIS_CREATE_USER_LOCK"); return emisCustomerUser; }catch(Exception ex){ @@ -2569,6 +2577,9 @@ public class EmisBaseService { } } + + + /** * 创建月结客户 * @param emisCustomerUser @@ -2595,6 +2606,9 @@ public class EmisBaseService { oldUser.setDelFlag("0"); emisCustomerUserMapper.updateEmisCustomerUser(oldUser); + // 插入角色 + emisCustomerUserMapper.insertSysOmsUserRole(oldUser.getId()); + } redissonService.unlock("EMIS_CREATE_USER_LOCK"); return oldUser; @@ -2618,8 +2632,9 @@ public class EmisBaseService { emisCustomerUser.preInsert(); emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser); + // 插入角色 + emisCustomerUserMapper.insertSysOmsUserRole(emisCustomerUser.getId()); - // 插入登录角色 redissonService.unlock("EMIS_CREATE_USER_LOCK"); return emisCustomerUser; }catch(Exception ex){ diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index 2e08e0dc7..b7f5e0536 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -439,4 +439,12 @@ + + insert into sys_oms_user_role(user_id,role_id) + select #{userId},127 from dual + where not exists (select 1 from sys_oms_user_role where user_id=#{userId} and role_id=127) + + + + \ No newline at end of file