purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化消息通知模块的接口

Browse Source
This commit is contained in:
季圣华
2023-02-24 23:16:27 +08:00
parent e7287d0f8b
commit 335264d101
4 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -494,6 +494,7 @@ public class UserController {
data.put("expireTime", Tools.parseDateToStr(tenant.getExpireTime()));
data.put("userCurrentNum", userCurrentNum);
data.put("userNumLimit", tenant.getUserNumLimit());
data.put("tenantId", tenant.getTenantId());
res.code = 200;
res.data = data;
} catch (Exception e) {

6
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MsgMapperEx.java
View File

@@ -9,19 +9,17 @@ import java.util.List;
public interface MsgMapperEx {
List<MsgEx> selectByConditionMsg(
@Param("userId") Long userId,
@Param("name") String name,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
Long countsByMsg(
@Param("userId") Long userId,
@Param("name") String name);
int batchDeleteMsgByIds(@Param("ids") String ids[]);
int insertSelectiveByTask(Msg record);
int checkIsNameExistByTask(@Param("msgTitle") String msgTitle);
Long getMsgCountByStatus(
@Param("status") String status,
@Param("userId") Long userId);

7
jshERP-boot/src/main/java/com/jsh/erp/service/msg/MsgService.java
View File

@@ -82,7 +82,7 @@ public class MsgService {
try{
User userInfo = userService.getCurrentUser();
if(!BusinessConstants.DEFAULT_MANAGER.equals(userInfo.getLoginName())) {
list = msgMapperEx.selectByConditionMsg(name, offset, rows);
list = msgMapperEx.selectByConditionMsg(userInfo.getId(), name, offset, rows);
if (null != list) {
for (MsgEx msgEx : list) {
if (msgEx.getCreateTime() != null) {
@@ -105,7 +105,7 @@ public class MsgService {
try{
User userInfo = userService.getCurrentUser();
if(!BusinessConstants.DEFAULT_MANAGER.equals(userInfo.getLoginName())) {
result = msgMapperEx.countsByMsg(name);
result = msgMapperEx.countsByMsg(userInfo.getId(), name);
}
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
@@ -235,7 +235,8 @@ public class MsgService {
User userInfo = userService.getCurrentUser();
if(!BusinessConstants.DEFAULT_MANAGER.equals(userInfo.getLoginName())) {
MsgExample example = new MsgExample();
example.createCriteria().andStatusEqualTo(status).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.createCriteria().andStatusEqualTo(status).andUserIdEqualTo(userInfo.getId())
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Msg> list = msgMapper.selectByExample(example);
if (null != list) {
for (Msg msg : list) {