fix(system):

1.补充相关接口权限配置
2.小程序修复场地列表查询字段未回显

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/AppHomeServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.app.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.ObjectUtils;
@@ -162,7 +163,7 @@ public class AppHomeServiceImpl implements IAppHomeService {
     public Page<PlaceVO> getPlaceList(GetPlaceListDTO getPlaceListDTO) {
         Page<PlaceVO> page = new Page<>(getPlaceListDTO.getCurrent(), getPlaceListDTO.getSize());
         Page<PlaceVO> placeList = appSiteMapper.getPlaceList(page, getPlaceListDTO.getVenueType());
-        if (placeList.getRecords()!=null&&placeList.getRecords().isEmpty()){
+        if (ObjectUtil.isNotEmpty(placeList)) {
             placeList.getRecords().forEach(placeVO -> {
                 boolean ticketWhether = false;
                 List<AppSitePriceRules> appSitePriceRules = new ArrayList<>();

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppCoursesController.java

@@ -54,7 +54,7 @@ public class AppCoursesController extends JeecgController<AppCourses, IAppCoures
 	 */
 	@AutoLog(value = "课程/培训表-添加")
 	@Operation(summary="课程/培训表-添加")
-//	@RequiresPermissions("org.jeecg.modules.app:nm_courese:add")
+	@RequiresPermissions("app:appCourese:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody AppCoursesDTO appCoursesDTO) {
 		return appCoursesService.saveWitchPriceRules(appCoursesDTO)?Result.OK("添加成功！"):Result.error("添加失败！");
@@ -68,7 +68,7 @@ public class AppCoursesController extends JeecgController<AppCourses, IAppCoures
 	 */
 	@AutoLog(value = "课程/培训表-编辑")
 	@Operation(summary="课程/培训表-编辑")
-//	@RequiresPermissions("org.jeecg.modules.app:nm_courese:edit")
+	@RequiresPermissions("app:appCourese:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody AppCoursesDTO appCoursesDTO) {
 		return appCoursesService.editWitchPriceRules(appCoursesDTO)?Result.OK("操作成功！"):Result.error("操作失败！");
@@ -82,7 +82,7 @@ public class AppCoursesController extends JeecgController<AppCourses, IAppCoures
 	 */
 	@AutoLog(value = "课程/培训表-通过id删除")
 	@Operation(summary="课程/培训表-通过id删除")
-//	@RequiresPermissions("org.jeecg.modules.app:nm_courese:delete")
+	@RequiresPermissions("app:appCourese:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		return appCoursesService.deleteWitchPriceRulesById(id)?Result.OK("操作成功！"):Result.error("操作失败！");

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppSitePlaceController.java

@@ -81,7 +81,7 @@ public class AppSitePlaceController extends JeecgController<AppSitePlace, IAppSi
      */
     @AutoLog(value = "商户无固定场所-添加")
     @Operation(summary = "商户无固定场所-添加")
-//	@RequiresPermissions("org.jeecg.modules.system.app:nm_site_place:add")
+	@RequiresPermissions("app:appSitePlace:addUnfixed")
     @PostMapping(value = "/addUnfixed")
     public Result<String> addUnfixed(@RequestBody
                                      AppSitePlaceUnfixedDTO unfixedDTO) {
@@ -160,13 +160,14 @@ public class AppSitePlaceController extends JeecgController<AppSitePlace, IAppSi
      * 根据orgCode查询site列表
      *
      * @param orgCode
+     * @param type
      * @return
      */
     @AutoLog(value = "根据orgCode查询商户信息列表")
     @Operation(summary = "根据orgCode查询site列表")
-    @GetMapping(value = "/queryByOrgCode/{orgCode}")
-    public Result<List<AppSite>> queryByOrgCode(@PathVariable(name = "orgCode") String orgCode) {
-        List<AppSite> appSites = appSitePlaceService.queryByOrgCode(orgCode);
+    @GetMapping(value = "/queryByOrgCode")
+    public Result<List<AppSite>> queryByOrgCode(@RequestParam(name = "orgCode", required = true) String orgCode,@RequestParam(name = "type") Integer type) {
+        List<AppSite> appSites = appSitePlaceService.queryByOrgCode(orgCode,type);
         return Result.OK(appSites);
     }
 
@@ -178,7 +179,7 @@ public class AppSitePlaceController extends JeecgController<AppSitePlace, IAppSi
      */
     @AutoLog(value = "c-编辑")
     @Operation(summary = "商户无固定场所-编辑")
-//	@RequiresPermissions("org.jeecg.modules.system.app:nm_site_place:edit")
+	@RequiresPermissions("app:appSitePlace:updateUnfixed")
     @RequestMapping(value = "/updateUnfixed", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> updateUnfixed(@RequestBody AppSitePlaceUnfixedDTO unfixedDTO) {
         Boolean b = appSitePlaceService.updateUnfixed(unfixedDTO);
@@ -208,7 +209,7 @@ public class AppSitePlaceController extends JeecgController<AppSitePlace, IAppSi
      */
     @AutoLog(value = "商户无固定场所-通过id删除")
     @Operation(summary = "商户无固定场所-通过id删除")
-//	@RequiresPermissions("org.jeecg.modules.system.app:nm_site_place:delete")
+	@RequiresPermissions("app:appSitePlace:deleteUnfixed")
     @DeleteMapping(value = "/deleteUnfixed")
     public Result<String> deleteUnfixed(@RequestParam(name = "id", required = true) String id) {
         appSitePlaceService.deleteUnfixed(id);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppSitePlaceService.java

@@ -117,5 +117,5 @@ public interface IAppSitePlaceService extends IService<AppSitePlace> {
 
     AppSitePlaceParkDTO queryPack(String siteId);
 
-    List<AppSite> queryByOrgCode(String orgCode);
+    List<AppSite> queryByOrgCode(String orgCode,Integer type);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSitePlaceServiceImpl.java

@@ -332,7 +332,7 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
         Page<AppSitePlace> page = new Page<>(dto.getPageNum(), dto.getPageSize());
         LambdaQueryWrapper<AppSitePlace> wrapper = Wrappers.<AppSitePlace>lambdaQuery().eq(AppSitePlace::getType, SitePlaceTypeEnum.UNFIXED.getCode())
 //                .eq(AppSitePlace::getSiteId, dto.getSiteId())
-                .eq(AppSitePlace::getOrgCode, loginUser.getOrgCode())
+                .likeRight(AppSitePlace::getOrgCode, loginUser.getOrgCode())
                 .eq(AppSitePlace::getType, SitePlaceTypeEnum.UNFIXED.getCode())
                 .like(StringUtils.isNotBlank(dto.getName()), AppSitePlace::getName, dto.getName()).orderByDesc(AppSitePlace::getCreateTime);
 
@@ -922,8 +922,10 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
     }
 
     @Override
-    public List<AppSite> queryByOrgCode(String orgCode) {
-        return appSiteMapper.selectList(Wrappers.<AppSite>lambdaQuery().eq(AppSite::getOrgCode, orgCode));
+    public List<AppSite> queryByOrgCode(String orgCode,Integer type) {
+        return appSiteMapper.selectList(Wrappers.<AppSite>lambdaQuery()
+                        .eq(ObjectUtil.isNotEmpty(type), AppSite::getType, type)
+                .likeRight(AppSite::getOrgCode, orgCode));
     }
 
     /**