Merge branch '20250428首页' of http://git.dgtis.com/qxp/suishenbang-oneportal into 20250428首页

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -313,14 +313,15 @@ public class WxMagnetServiceImpl implements IWxMagnetService
                 throw new RuntimeException("活动图标json数据格式错误！");
             }
         }
-        if(StringUtils.isBlank(String.valueOf(homeIconConfig.getId()))) {
+        if(homeIconConfig.getId()==null) {
             String insertSql = "INSERT INTO system_home_config (portal_background,small_icon_extra,activity_icon_extra,activity_icon_starttime,activity_icon_endtime,bottom_prompt_text,prompt_text_color,create_by,create_time) VALUES (?,?,?,?,?,?,?,?,now());";
             Object[] args = new Object[]{homeIconConfig.getPortal_background(), homeIconConfig.getSmall_icon_extra(), homeIconConfig.getActivity_icon_extra(), homeIconConfig.getActivity_icon_starttime(), homeIconConfig.getActivity_icon_endtime(), homeIconConfig.getBottom_prompt_text(), homeIconConfig.getPrompt_text_color(),homeIconConfig.getCreateBy()};
             jdbcTemplate.update(insertSql, args);
+        }else {
+            String updateSql = "update  system_home_config  set portal_background=?,small_icon_extra=?,activity_icon_extra=?,activity_icon_starttime=?,activity_icon_endtime=?,bottom_prompt_text=?,prompt_text_color=?,update_by=?,update_time=now() where id=?;";
+            Object[] args = new Object[]{homeIconConfig.getPortal_background(), homeIconConfig.getSmall_icon_extra(), homeIconConfig.getActivity_icon_extra(), homeIconConfig.getActivity_icon_starttime(), homeIconConfig.getActivity_icon_endtime(), homeIconConfig.getBottom_prompt_text(), homeIconConfig.getPrompt_text_color(), homeIconConfig.getUpdateBy(), homeIconConfig.getId()};
+            jdbcTemplate.update(updateSql, args);
         }
-        String updateSql = "update  system_home_config  set portal_background=?,small_icon_extra=?,activity_icon_extra=?,activity_icon_starttime=?,activity_icon_endtime=?,bottom_prompt_text=?,prompt_text_color=?,update_by=?,update_time=now() where id=?;";
-        Object[] args = new Object[]{homeIconConfig.getPortal_background(), homeIconConfig.getSmall_icon_extra(), homeIconConfig.getActivity_icon_extra(), homeIconConfig.getActivity_icon_starttime(), homeIconConfig.getActivity_icon_endtime(), homeIconConfig.getBottom_prompt_text(), homeIconConfig.getPrompt_text_color(),homeIconConfig.getUpdateBy(),homeIconConfig.getId()};
-        jdbcTemplate.update(updateSql, args);
     }
 
     @Override

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/java/com/dgtly/wxportal/controller/WxMagnetController.java

@@ -189,7 +189,6 @@ public class WxMagnetController extends BaseController
      */
 
     @Log(title = "首页图标配置", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("wxportal:magnethome:edit")
     @PostMapping("/editHome")
     @ResponseBody
     public AjaxResult editHomeSave(@RequestBody HomeIconConfig homeIconConfig)