Merge remote-tracking branch 'origin/main'

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java

@@ -304,7 +304,7 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
             List<SrsStuYear> yearList = _yearMapper.selectYearsByTag("NLZJ");
 
             SrsStuYear year = yearList.get(0);
-            if(!year.getModuleTags().contains("TSKN")){
+            if(!year.getModuleTags().contains("NLZJ")){
                 throw new Exception("当前学年未关联到国家励志奖学金标签!");
             }
             Long yearId = year.getId();

srs-workstudy/src/main/resources/mapper/workstudy/QgzxMoneyMapper.xml

@@ -227,7 +227,10 @@
     <select id="listView" parameterType="QgzxMoney" resultType="QgzxMoney">
         select * from (
         select t2.* from (
-        select a.*,b.stu_no,c.post_name,d.dept_name,e.dept_name as stu_dept,
+        select a.id,a.stu_post_id,a.total_time,a.apply_sign,a.apply_no,a.apply_time,a.apply_status,
+        a.dept_sign,a.dept_cmt,null as dept_time,a.dept_no,null as high_time,a.high_no,a.high_cmt,a.high_sign,
+        a.final_no,a.final_time,a.final_cmt,a.final_sign,a.audit_remark,null as money,
+        b.stu_no,c.post_name,d.dept_name,e.dept_name as stu_dept,
         e.stu_name,e.class_name,e.grade_name,f.name as dept_no_name,
         g.name as high_name,h.name as final_name,
         c.work_need,b.bank_card,d.dept_id,b.family_condition,c.post_type,b.id_card,