fix 评论

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/boman/common/**","/sendSms/**","/system/pinglun/**").permitAll()
-                .antMatchers("/system/personnel/**", "/reservat/config/**", "/reservat/time/**","/system/reservat/**","/system/news/**","/system/annex/list").permitAll()
+                .antMatchers("/system/personnel/**", "/reservat/config/**", "/reservat/time/**","/system/reservat/**","/system/news/**","/system/annex/listNo").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanAnnexServiceImpl.java

@@ -74,12 +74,16 @@ public class BomanAnnexServiceImpl implements IBomanAnnexService
     @Override
     public int updateBomanAnnex(BomanAnnex bomanAnnex)
     {
-        BomanAnnex bomanAnnexUp = bomanAnnex.getBomanAnnexList().get(0);
-        bomanAnnexUp.setAnnexId(bomanAnnex.getAnnexId());
-        bomanAnnexUp.setKeywords(bomanAnnex.getKeywords());
-        bomanAnnexUp.setReleaseTime(bomanAnnex.getReleaseTime());
-        bomanAnnexUp.setUpdateTime(DateUtils.getNowDate());
-        return bomanAnnexMapper.updateBomanAnnex(bomanAnnexUp);
+        List<BomanAnnex> bomanAnnexList = bomanAnnex.getBomanAnnexList();
+        if (bomanAnnexList != null && bomanAnnexList.size()>0){
+            BomanAnnex bomanAnnexUp = bomanAnnex.getBomanAnnexList().get(0);
+            bomanAnnexUp.setAnnexId(bomanAnnex.getAnnexId());
+            bomanAnnexUp.setKeywords(bomanAnnex.getKeywords());
+            bomanAnnexUp.setReleaseTime(bomanAnnex.getReleaseTime());
+            bomanAnnexUp.setUpdateTime(DateUtils.getNowDate());
+            return bomanAnnexMapper.updateBomanAnnex(bomanAnnexUp);
+        }
+        return bomanAnnexMapper.updateBomanAnnex(bomanAnnex);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanNewsServiceImpl.java

@@ -136,10 +136,11 @@ public class BomanNewsServiceImpl implements IBomanNewsService
         //本月数据
         List<BomanNews> bomanNewsList = bomanNewsMapper.selectBomanNewsList(bomanNews);
         //查询上月数据
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
         Calendar c = Calendar.getInstance();
         c.add(Calendar.MONTH, -1); //得到前一个月
         bomanNews.setReleaseTime(DateUtils.parseDate(format.format(c.getTime())));
+        //todo 上月数据放到redis中
         List<BomanNews> bomanNewsListLast = bomanNewsMapper.selectBomanNewsList(bomanNews);
         if (bomanNewsList != null && bomanNewsList.size() > 0){
             map.put("yearMonth",bomanNewsList.size());