| @@ -153,8 +153,8 @@ public class ShiroConfig { | |||||
| //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 | //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 | ||||
| filterChainDefinitionMap.put("/logout", "authc"); | filterChainDefinitionMap.put("/logout", "authc"); | ||||
| // filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | |||||
| filterChainDefinitionMap.put("/**", "anon"); | |||||
| filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | |||||
| // filterChainDefinitionMap.put("/**", "anon"); | |||||
| shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | ||||
| @@ -60,8 +60,25 @@ public class WxMiniappThemeController extends BaseController { | |||||
| if(wxMiniappTheme.getType() == null){ | if(wxMiniappTheme.getType() == null){ | ||||
| wxMiniappTheme.setType(EnumThemeType.C.getCode()); | wxMiniappTheme.setType(EnumThemeType.C.getCode()); | ||||
| } | } | ||||
| PageInfo<WxMiniappTheme> page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize); | PageInfo<WxMiniappTheme> page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize); | ||||
| WxThemeMall wxThemeMall = new WxThemeMall(); | |||||
| wxThemeMall.setTenantId(getTenantInfo().getTenantId()); | |||||
| wxThemeMall.setThemeType(EnumThemeType.C.getCode()); | |||||
| WxThemeMall themeMall = wxMiniappThemeService.findThemeMall(wxThemeMall); | |||||
| boolean updateStatus = true; | |||||
| if(themeMall != null){ | |||||
| for (WxMiniappTheme theme:page.getList()) { | |||||
| if(theme.getId().equals(themeMall.getThemeId())){ | |||||
| theme.setStatus(0); | |||||
| updateStatus = false; | |||||
| }else{ | |||||
| theme.setStatus(1); | |||||
| } | |||||
| } | |||||
| } | |||||
| if(updateStatus){ | |||||
| page.getList().get(0).setStatus(0); | |||||
| } | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| }catch (Exception e){ | }catch (Exception e){ | ||||
| @@ -29,6 +29,9 @@ public class WxMiniappTheme implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @TableField(exist = false) | |||||
| private Integer status; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<WxMiniappThemeValue> wxMiniappThemeValue; | private List<WxMiniappThemeValue> wxMiniappThemeValue; | ||||
| @@ -49,5 +49,7 @@ public interface WxMiniappThemeService { | |||||
| List<WxMiniappThemeValue> findTheme(WxThemeMall wxThemeMall); | List<WxMiniappThemeValue> findTheme(WxThemeMall wxThemeMall); | ||||
| WxThemeMall findThemeMall(WxThemeMall wxThemeMall); | |||||
| List<WxMiniappThemeValue> findDefaultList(Integer code); | List<WxMiniappThemeValue> findDefaultList(Integer code); | ||||
| } | } | ||||
| @@ -115,6 +115,11 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService { | |||||
| return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall); | return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall); | ||||
| } | } | ||||
| @Override | |||||
| public WxThemeMall findThemeMall(WxThemeMall wxThemeMall) { | |||||
| return wxThemeMallMapper.findOne(wxThemeMall); | |||||
| } | |||||
| @Override | @Override | ||||
| public List<WxMiniappThemeValue> findDefaultList(Integer code) { | public List<WxMiniappThemeValue> findDefaultList(Integer code) { | ||||
| return wxMiniappThemeMapper.findDefaultList(code); | return wxMiniappThemeMapper.findDefaultList(code); | ||||
| @@ -29,7 +29,7 @@ | |||||
| <if test=" null != type"> | <if test=" null != type"> | ||||
| and `type` = #{type} | and `type` = #{type} | ||||
| </if> | </if> | ||||
| order by create_date asc | |||||
| order by id asc | |||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap"> | ||||