标签管理-标签项修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java

@@ -72,7 +72,18 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 		List<OnlCgformArea> list = onlCgformAreaService.queryList(onlCgformArea);
 		return Result.OK(list);
 	}
-
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "查询展示区域")
+	@ApiOperation(value="查询展示区域", notes="查询展示区域")
+	@GetMapping(value = "/queryShowArea")
+	public Result<List<OnlCgformArea>> queryShowArea(OnlCgformArea onlCgformArea){
+		List<OnlCgformArea> list = onlCgformAreaService.queryShowArea(onlCgformArea);
+		return Result.OK(list);
+	}
 	/**
 	 *   添加
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java

@@ -37,7 +37,8 @@ import java.util.List;
 public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgformTagService> {
 	@Autowired
 	private IOnlCgformTagService onlCgformTagService;
-
+	@Autowired
+	OnlCgformTagController onlCgformAreaService;
 	/**
 	 * 分页列表查询
 	 *
@@ -121,7 +122,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id);
 		if(StringUtils.isNotBlank(String.valueOf(onlCgformTag.getIsReadOnly()))) {
 			if (onlCgformTag.getIsReadOnly() == 1 || onlCgformTag.getIsReadOnly() == 2) {
-				result.error("固定字段,不可删除");
+				result.error500("固定字段,不可删除");
 			} else {
 				onlCgformTagService.deleteById(id);
 				result.OK("删除成功！");
@@ -166,32 +167,6 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		return Result.OK(onlCgformTag);
 	}
 
-	/**
-	 * 通过id查询查展示区域
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "标签管理-通过id查询展示区域")
-	@ApiOperation(value="标签管理-通过id查询展示区域", notes="标签管理-通过id查询展示区域")
-	@GetMapping(value = "/selectShowArealById")
-	public Result<List<OnlCgformTag>> selectShowAreaById(@RequestParam(name="id",required=true) String id) {
-		List<OnlCgformTag> list = onlCgformTagService.selectShowAreaById(id);
-		return Result.OK(list);
-	}
-	/**
-	 * 通过id查询字典名称
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "标签管理-通过id查询字典名称")
-	@ApiOperation(value="标签管理-通过id查询字典名称", notes="标签管理-通过id查询字典名称")
-	@GetMapping(value = "/selectDictNameById")
-	public Result<List<OnlCgformTag>> selectDictNameById(@RequestParam(name="id",required=true) String id) {
-		List<OnlCgformTag> list = onlCgformTagService.selectDictNameById(id);
-		return Result.OK(list);
-	}
 	/**
 	 * 导出excel
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java

@@ -59,7 +59,12 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
 	 * @return
 	 */
     List<OnlCgformArea> queryList(OnlCgformArea onlCgformArea);
-
+	/**
+	 * 查询展示区域
+	 *
+	 * @return
+	 */
+	List<OnlCgformArea> queryShowArea(OnlCgformArea onlCgformArea);
 	/**
 	 * 展示区域查询
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java

@@ -53,23 +53,9 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
 	 */
     OnlCgformTag queryById(String id);
 
-	/**
+	List<OnlCgformTag> queryShowAreaById(String id);
-	 * 通过id查询展示区域
-	 *
-	 * @param id
-	 * @return
-	 */
-	List<OnlCgformTag> selectShowAreaById(String id);
 
 	/**
-	 * 通过id查询字典名称
-	 *
-	 * @param id
-	 * @return
-	 */
-	List<OnlCgformTag> selectDictNameById(String id);
-
-    /**
 	 * 列表查询
 	 *
 	 * @return

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java

@@ -95,6 +95,21 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 		}
 		return list(lambdaQueryWrapper);
 	}
+
+	/**
+	 * 查询展示区域
+	 *
+	 * @return
+	 */
+	@Override
+	public List<OnlCgformArea> queryShowArea(OnlCgformArea onlCgformArea) {
+		QueryWrapper<OnlCgformArea> QueryWrapper = new QueryWrapper<>();
+		if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){
+		QueryWrapper.select("id","show_area").orderByAsc("sort");
+		}
+		return list(QueryWrapper);
+	}
+
 	/**
 	 * 展示区域查询
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java

@@ -87,20 +87,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	 *根据id查展示区域
 	 */
 	@Override
-	public List<OnlCgformTag> selectShowAreaById(String id) {
+	public List<OnlCgformTag> queryShowAreaById(String id) {
 		QueryWrapper<OnlCgformTag> queryWrapper=new QueryWrapper<>();
 		queryWrapper.select("show_area").eq("id",id);
 		return list(queryWrapper);
 	}
-	/**
+
-	 *根据id查展示区域
-	 */
-	@Override
-	public List<OnlCgformTag> selectDictNameById(String id) {
-		QueryWrapper<OnlCgformTag> queryWrapper=new QueryWrapper<>();
-		queryWrapper.select("dict_name").eq("id",id);
-		return list(queryWrapper);
-	}
 	/**
 	 * 列表查询
 	 *
@@ -120,7 +112,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	public void queryExitData(OnlCgformTag onlCgformTag) {
 		QueryWrapper<OnlCgformTag> queryWrapper = new QueryWrapper<>();
 		queryWrapper.like("isModel",onlCgformTag.getIsModel()).and(wq->wq.like("db_field_txt",onlCgformTag.getDbFieldTxt()));
-		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
+		Integer count = Math.toIntExact(onlCgformTagMapper.selectCount(queryWrapper));
 	}
 
 }

jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue

@@ -276,7 +276,7 @@
       //获取展示区域
       loadShowArea(){
         let params = {};
-        getAction(`tag/onlCgformTag/queryShowArea`,params).then((res)=>{
+        getAction(`tag/onlCgformArea/queryShowArea`,params).then((res)=>{
           if(res.success){
             this.areaOptions=res.result
           }