Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain into master

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/controller/AlarmUserController.java

@@ -82,8 +82,6 @@ public class AlarmUserController {
      * @date  2024/12/02 15:41
      */
     @Operation(summary = "编辑报警接收人")
-    @CommonLog("编辑报警接收人")
-    @SaCheckPermission("/coldchain/alarmuser/edit")
     @PostMapping("/coldchain/alarmuser/edit")
     public CommonResult<String> edit(@RequestBody @Valid AlarmUserEditParam alarmUserEditParam) {
         alarmUserService.edit(alarmUserEditParam);

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/service/impl/AlarmUserServiceImpl.java

@@ -270,7 +270,7 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
             AlarmUser alarmUser = new AlarmUser();
             alarmUser.setOpenId(openid);
             alarmUser.setSubscribed(AlarmUserEnum.SUBSCRIBE.getValue());
-            SysUser sysUser = createSysUser(alarmUser, null, null);
+            SysUser sysUser = createSysUser(alarmUser, null, "");
 
             alarmUser.setUserId(sysUser.getId());
             alarmUser.setId(IdWorker.getIdStr());

snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java

@@ -110,6 +110,7 @@ public class GlobalConfigure implements WebMvcConfigurer {
             /* 微信相关的 */
             "/wx/**",
             "/coldchain/alarmuser/getUserInfo",
+            "/coldchain/alarmuser/edit",
             /* 静态资源 */
             "/favicon.ico", "/doc.html", "/webjars/**", "/v3/api-docs/**", "/druid/**",
             /* 移动端静态资源 */

snowy-web-app/src/main/java/vip/xiaonuo/weixin/gongzhong/controller/WxMpController.java

@@ -19,6 +19,7 @@ import vip.xiaonuo.coldchain.modular.push.utils.PushUtil;
 import vip.xiaonuo.dev.modular.config.service.DevConfigService;
 
 import java.util.List;
+import java.util.Objects;
 
 @CrossOrigin
 @RestController
@@ -57,7 +58,7 @@ public class WxMpController {
 
         if (CollUtil.isNotEmpty(userList)) {
             //检查用户的组织机构
-            long count = userList.stream().filter(x -> StrUtil.isNotBlank(x.getCreateOrg())).count();
+            long count = userList.stream().filter(x -> !Objects.equals(x.getCreateOrg(), "-1")).count();
             if (count > 0) {
                 //进入授权页面
                 String redirect = devConfigService.getValueByKey("wx_front_authed_page");