标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -250,8 +250,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     @Override
     public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
-        wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","s.uName");
-        wrapper.last("inner join ts_user s on s.USID = sar_stand_project_library.project_manager");
+        wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName");
+        wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" +
+                " and sar_stand_project_library.product_line IS not NULL");
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -764,7 +764,8 @@
         SAR_STANDARDS_INFO.valid_flag,
         SAR_STANDARDS_INFO.creation_time,
         SAR_STANDARDS_INFO.modify_time,
-        SAR_STANDARDS_INFO.STAND_SYSTEM
+        SAR_STANDARDS_INFO.STAND_SYSTEM,
+        SAR_STANDARDS_INFO.IS_RELATE_ACCESS
         from SAR_STANDARDS_INFO
         <include refid="SarStandardsInfo_in_left"/>
         ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a