Explorar el Código

LY 预约票 bugfix

ly hace 2 años
padre
commit
d2c60ddad5

+ 1 - 1
master/src/main/java/com/ruoyi/project/training/controller/TTrainingParticipantsController.java

@@ -74,7 +74,7 @@ public class TTrainingParticipantsController extends BaseController
         List<List> companyLevelList = new ArrayList<>();
         List<TTrainingCompanylevel> tTrainingCompanylevels = tTrainingCompanylevelService.selectTTrainingCompanylevelList(new TTrainingCompanylevel());
         TStaffmgr staffmgr = new TStaffmgr();
-        staffmgr.setUnits("10,18");
+        staffmgr.setUnits("10,18,20");
         List<TStaffmgr> staffmgrs = tStaffmgrService.selectRecordList(staffmgr);
         for (int i = 0; i < tTrainingCompanylevels.size(); i++) {
             //每一类公司级培训数据

+ 1 - 1
master/src/main/resources/mybatis/invoice/TInvoiceBookingworkticketMapper.xml

@@ -167,8 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          left join sys_user su on r.DEV_SUP_ID = su.user_id
          left join sys_user su2 on d.user_mg = su2.user_id
         where d.id = #{id}
-        and r.status!=3
         and d.del_flag = 0
+         and   rownum = 1
     </select>
 
  <!--   <select id="getWorkcontentList" resultType="TInvoiceWorkcontent" parameterType="int">