Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/sys/controller/SysMenuController.java

@@ -38,7 +38,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @IocBean
 @At("/platform/sys/menu")
@@ -391,11 +390,11 @@ public class SysMenuController {
     @At
     @Ok("json")
     @SaCheckPermission("sys.manager.menu.edit")
-    public Object sortDo(@Param("ids") String ids, HttpServletRequest req) {
+    public Object sortDo(@Param("ids") String ids, @Param("platform") String platform, HttpServletRequest req) {
         try {
             String[] menuIds = StringUtils.split(ids, ",");
             int i = 0;
-            sysMenuService.execute(Sqls.create("update sys_menu set location=0"));
+            sysMenuService.execute(Sqls.create("update sys_menu set location=0 where platform = '%s'".formatted(platform)));
             for (String s : menuIds) {
                 if (!Strings.isBlank(s)) {
                     sysMenuService.update(org.nutz.dao.Chain.make("location", i), Cnd.where("id", "=", s));
@@ -425,11 +424,11 @@ public class SysMenuController {
     @SaCheckPermission("sys.manager.menu")
     @ApiOperation("更新首页推荐应用或服务")
     public Result updateRecommendSetting(@Param("menuIds") String[] menuIds, String platform, String type) {
-		String column = "";
-		switch (type) {
-			case "app" -> column = "isRecommendApp";
-			case "service" -> column = "isRecommendService";
-		}
+        String column = "";
+        switch (type) {
+            case "app" -> column = "isRecommendApp";
+            case "service" -> column = "isRecommendService";
+        }
         sysMenuService.update(Chain.make(column, 0), Cnd.where("id", "is not", null).and("platform", "=", platform));
         if (ArrayUtil.isNotEmpty(menuIds)) {
             sysMenuService.update(Chain.make(column, 1), Cnd.where("id", "in", menuIds).and("platform", "=", platform));

src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -304,7 +304,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
         String decodePwd = Base64Decoder.decodeStr(passowrd);
         String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt());
         if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) {
-            if (!Globals.sso) {
+            if (Globals.sso) {
                 throw new BaseException("用户名或者密码不正确");
             }
         }