feat: There is no way the

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsMenu/controller/SarLawsMenuController.java

@@ -31,7 +31,7 @@ import java.util.List;
 */
 @RestController
 @Api(description = "|SarLawsMenu|")
-@RequestMapping("/sarLawsMenu/sar-laws-menu")
+@RequestMapping("/${restPath}/lawss/sarLawsMenu")
 public class SarLawsMenuController extends BaseController<SarLawsMenu> {
 
     @Autowired
@@ -63,7 +63,7 @@ public class SarLawsMenuController extends BaseController<SarLawsMenu> {
                 if (getList == null || getList.isEmpty()) {
                     // 查询根节点
                     TsResource sarMenuEO = new TsResource();
-                    sarMenuEO.setSorDivide("BUSINESS_STAND");
+                    sarMenuEO.setSorDivide("LAWS_STAND");
                     List<TsResource> getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO);
                     menuEO.setMenuId(getRootMenu.get(0).getId());
                     menuEO.setId(UUIDUtils.randomUUID20());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java

@@ -127,6 +127,63 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 
+    @ApiOperation(value = "|SarLawsInfoEO|分页查询")
+    @GetMapping("/pageLaws")
+    /*@RequiresPermissions("lawss:sarLawsInfo:page")*/
+    public ResponseMessage<PageInfo<SarLawsStandInfo>> pageLaws(SarLawsStandInfoPage page) throws Exception {
+        if (null != page.getNowOrderBy()) {
+            switch (page.getNowOrderBy()) {
+                case 1:
+                    page.setOrderByA("a.issueTime");//发布日期
+                    break;
+                case 2:
+                    page.setOrderByA("SAR_LAWS_ATTR_INFO.XCXSSRQLAWS");//新车型实施日期
+                    break;
+                case 3:
+                    page.setOrderByA("SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS");//在产车实施日期
+                    break;
+                case 4:
+                    page.setOrderByA("a.LAWS_TEXT_STATE");//文本状态
+                    break;
+                case 5:
+                    page.setOrderByA("paixu");
+                    break;
+                case 6:
+                    page.setOrderByA("SAR_LAWS_ATTR_INFO.SSRQ");
+                    break;
+                default:
+                    page.setNowOrder(null);
+                    break;
+            }
+            if (null != page.getNowOrder()) {
+                switch (page.getNowOrder()) {
+                    case 1:
+                        page.setOrder1("desc");
+                        break;
+                    case 2:
+                        page.setOrder1("asc");
+                    default:
+                        page.setOrder1(null);
+                        break;
+                }
+            }
+        }
+
+
+        if (com.adc.da.util.utils.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+            String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_LAWS_ATTR_INFO");
+            if (StringUtils.isNotBlank(advanceStr)) {
+                page.setAdvanceSearchStr(advanceStr);
+            } else {
+                page.setAdvanceSearchStr(null);
+            }
+        }
+
+        List<SarLawsStandInfo> rows = sarLawsInfoEOService.getSarStandardsInfoPage(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
     @ApiOperation(value = "|SarLawsStandInfo|详情")
     @GetMapping("/getStandInfoById")
     //@RequiresPermissions("lawss:sarStandardsInfo:get")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/ISarLawsStandInfoService.java

@@ -36,6 +36,8 @@ public interface ISarLawsStandInfoService extends IService<SarLawsStandInfo> {
 
     List<SarLawsStandInfo> getSarStandardsInfoPage(SarLawsStandInfoPage page) throws Exception;
 
+    List<SarLawsStandInfo> getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception;
+
     SarLawsStandInfo selectStandardsInfoByKey(String id) throws Exception;
 
     SarLawsStandInfo selectStandardsInfoUpdateByKey(String id) throws Exception;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java

@@ -157,7 +157,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
                 } else {
                     page.setMenuRoleList(null);
                 }
-                List<String> ids = iTsResourceService.getChildMenuList(userId);
+                List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
                 if (ids != null && !ids.isEmpty()) {
                     page.setMenuAllChildrenIdList(ids);
                 }
@@ -170,6 +170,36 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
         return rows;
     }
 
+    @Override
+    public List<SarLawsStandInfo> getSarStandardsInfoPageBak(SarLawsStandInfoPage page) throws Exception {
+        //查询当前登录人角色拥有权限的菜单
+        String userId = UserUtils.getUserId();
+        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(userId)){
+            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            qw.eq("ID",page.getMenuId());
+            qw.isNull("PARENT_ID");
+            List<TsResource> children = iTsResourceService.list(qw);
+            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+                List<String> getMenuIdList = tsUserService.getResourceUserId(userId);
+                if (!getMenuIdList.isEmpty()) {
+                    page.setMenuRoleList(getMenuIdList);
+                } else {
+                    page.setMenuRoleList(null);
+                }
+                List<String> ids = iTsResourceService.getChildMenuList(userId);
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
+            }
+        }
+        Integer rowCount = this.baseMapper.getSarStandardsInfoCount(page);
+        page.getPager().setRowCount(rowCount);
+        List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsInfoPage(page);
+        attrInfo(rows);
+        return rows;
+    }
+
+
     /***
      * @Description: 处理属性表数据
      * @Param: [sarlist]

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsMenu/SarLawsMenuMapper.xml

@@ -159,11 +159,14 @@
     <select id="selectMenuByMenuParentId" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
         select <include refid="Base_Column_List"/> from SAR_LAWS_MENU
         where laws_id = #{lawsId} and valid_flag=0
-        and MENU_ID in (select SAR_MENU.id from SAR_MENU where VALID_FLAG=0 start with id=#{menuId} connect by prior id= parent_id)
+        and MENU_ID in
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
 
     <update id="updateByLawsIdAndMenuId" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu" >
-        update SAR_BUSS_STAND_MENU
+        update SAR_LAWS_MENU
         <set >
             <if test="menuId != null" >
                 menu_id = #{menuId},
@@ -179,8 +182,10 @@
     <delete id="deleteByMenuId" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu">
         delete from SAR_LAWS_MENU
         where laws_id = #{lawsId}
-        and MENU_ID in (select SAR_MENU.id from SAR_MENU
+        and MENU_ID in
-        where VALID_FLAG=0 start with id=#{oldMenuId} connect by prior id= parent_id)
+        <foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </delete>
     <select id="selectAllMenuByStandId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarLawsMenu.entity.SarLawsMenu">
         select <include refid="Base_Column_List" />

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml

@@ -78,7 +78,7 @@
     </sql>
 
     <sql id="SarStandardsInfo_in_left">
-        left join SAR_STAND_MENU ON SAR_LAWS_STAND_INFO.id = SAR_STAND_MENU.stand_id
+        left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
         where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0
         <trim suffixOverrides=",">
             <!--                     基本搜索项                         -->
@@ -146,7 +146,7 @@
             </if>
             <!--  目录判断 -->
             <if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null">
-                and SAR_STAND_MENU.MENU_ID in
+                and SAR_LAWS_MENU.MENU_ID in
                 <foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -154,7 +154,7 @@
             </if>
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
             <if test="menuRoleList != null">
-                and SAR_STAND_MENU.MENU_ID in
+                and SAR_LAWS_MENU.MENU_ID in
                 <foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -226,8 +226,8 @@
         AND dicstandTextStatus.dic_id IS NOT NULL
         AND dicstandTextStatus.valid_flag = 0
         )
-        left join SAR_STAND_MENU ON SAR_LAWS_STAND_INFO.id = SAR_STAND_MENU.stand_id
+        left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
-        left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
+        left join TS_RESOURCE on SAR_LAWS_MENU.menu_id = TS_RESOURCE.id
         where SAR_LAWS_STAND_INFO.id = #{id}
     </select>