Merge branch 'master' into test

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.github.yitter.idgen.YitIdHelper;
 import com.xy.annotation.Lock;
 import com.xy.config.WebMqttConfig;
 import com.xy.consts.CommConsts;
+import com.xy.consts.SysConstant;
 import com.xy.dto.SysWorkUser.AddDto;
 import com.xy.dto.SysWorkUser.DelDto;
 import com.xy.dto.SysWorkUser.ListByRoleDto;
@@ -56,8 +57,6 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
     private WebMqttConfig webMqttConfig;
 
-    private static final Long BIZ_SYS_ID = 374535878972677L;
-
 
     @ApiOperation("获取所有售后权限用户ID")
     @Override
@@ -65,7 +64,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         UserInfoDto.SaleBackUsersVO vo = new UserInfoDto.SaleBackUsersVO();
         ListByRoleDto listByRoleDto = new ListByRoleDto();
         listByRoleDto.setRoleCode(CommConsts.MERC_SH_ADMIN);
-        listByRoleDto.setSysId(BIZ_SYS_ID);
+        listByRoleDto.setSysId(SysConstant.BIZ_SYS_ID);
         List<Long> userIds = R.feignCheckData(sysWorkUserService.getUserIdListByRole(listByRoleDto));
         //所有售后管理员及管理员创建的用户
         List<UserInfo> userInfoList = this.list(Wrappers.<UserInfo>lambdaQuery()

sys-api/src/main/java/com/xy/consts/SysConstant.java

@@ -0,0 +1,19 @@
+package com.xy.consts;
+
+
+/**
+ * 系统常量
+ *
+ * @author 谭斌
+ * @date 2024/03/04
+ */
+public class SysConstant {
+
+
+    /**
+     * 商户系统ID
+     */
+    public static final Long BIZ_SYS_ID = 374535878972677L;
+
+
+}