aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-30 16:37:40 +08:00
parent 08489f870a
commit ec3cabad19
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisArticleController.java
View File

@ -54,7 +54,6 @@ public class EmisArticleController extends BaseController
@Autowired @Autowired
private IEmisArticleLikeRecordService emisArticleLikeRecordService; private IEmisArticleLikeRecordService emisArticleLikeRecordService;
/** /**
* 查询文章管理列表 * 查询文章管理列表
*/ */

4
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java
View File

@ -44,6 +44,7 @@ public interface EmisCustomerUserMapper extends BaseMapper<EmisCustomerUser>
*/ */
public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser); public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser);
/** /**
* 修改 * 修改
* *
@ -94,4 +95,7 @@ public interface EmisCustomerUserMapper extends BaseMapper<EmisCustomerUser>
public EmisCustomerUser selectMonthCustomerByMonthlyPayCode(String monthlyPayCode); public EmisCustomerUser selectMonthCustomerByMonthlyPayCode(String monthlyPayCode);
public int insertSysOmsUserRole(Long omsUserId);
} }

23
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -2498,6 +2498,7 @@ public class EmisBaseService {
if(StringUtils.isEmpty(siteCode)){ if(StringUtils.isEmpty(siteCode)){
siteCode="88888"; siteCode="88888";
} }
String customerCode=genCustomerCode(); String customerCode=genCustomerCode();
crt.setCustomerCode(customerCode); crt.setCustomerCode(customerCode);
crt.setOwnerSite(siteCode); crt.setOwnerSite(siteCode);
@ -2537,6 +2538,9 @@ public class EmisBaseService {
oldUser.setDelFlag("0"); oldUser.setDelFlag("0");
emisCustomerUserMapper.updateEmisCustomerUser(oldUser); emisCustomerUserMapper.updateEmisCustomerUser(oldUser);
// 插入角色
emisCustomerUserMapper.insertSysOmsUserRole(oldUser.getId());
} }
redissonService.unlock("EMIS_CREATE_USER_LOCK"); redissonService.unlock("EMIS_CREATE_USER_LOCK");
return oldUser; return oldUser;
@ -2554,12 +2558,16 @@ public class EmisBaseService {
emisCustomerUser.setCustomerCode(customerCode); emisCustomerUser.setCustomerCode(customerCode);
emisCustomerUser.setOwnerSite(siteCode); emisCustomerUser.setOwnerSite(siteCode);
emisCustomerUser.setUserName(emisCustomerUser.getCustomerCode()); emisCustomerUser.setUserName(emisCustomerUser.getCustomerCode());
// emisCustomerUser.setCustomerType("1"); emisCustomerUser.setCustomerType("1");
// emisCustomerUser.setSettledType("1"); emisCustomerUser.setSettledType("1");
// emisCustomerUser.setUserType("1"); emisCustomerUser.setUserType("1");
emisCustomerUser.preInsert(); emisCustomerUser.preInsert();
emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser); emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser);
// 插入角色
emisCustomerUserMapper.insertSysOmsUserRole(emisCustomerUser.getId());
redissonService.unlock("EMIS_CREATE_USER_LOCK"); redissonService.unlock("EMIS_CREATE_USER_LOCK");
return emisCustomerUser; return emisCustomerUser;
}catch(Exception ex){ }catch(Exception ex){
@ -2569,6 +2577,9 @@ public class EmisBaseService {
} }
} }
/** /**
* 创建月结客户 * 创建月结客户
* @param emisCustomerUser * @param emisCustomerUser
@ -2595,6 +2606,9 @@ public class EmisBaseService {
oldUser.setDelFlag("0"); oldUser.setDelFlag("0");
emisCustomerUserMapper.updateEmisCustomerUser(oldUser); emisCustomerUserMapper.updateEmisCustomerUser(oldUser);
// 插入角色
emisCustomerUserMapper.insertSysOmsUserRole(oldUser.getId());
} }
redissonService.unlock("EMIS_CREATE_USER_LOCK"); redissonService.unlock("EMIS_CREATE_USER_LOCK");
return oldUser; return oldUser;
@ -2618,8 +2632,9 @@ public class EmisBaseService {
emisCustomerUser.preInsert(); emisCustomerUser.preInsert();
emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser); emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser);
// 插入角色
emisCustomerUserMapper.insertSysOmsUserRole(emisCustomerUser.getId());
// 插入登录角色
redissonService.unlock("EMIS_CREATE_USER_LOCK"); redissonService.unlock("EMIS_CREATE_USER_LOCK");
return emisCustomerUser; return emisCustomerUser;
}catch(Exception ex){ }catch(Exception ex){

8
emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
View File

@ -439,4 +439,12 @@
</select> </select>
<insert id="insertSysOmsUserRole" parameterType="Long">
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)
</insert>
</mapper> </mapper>