标签新增页-中英切换修改

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java

@@ -74,6 +74,7 @@ public class SysCategoryController {
 		queryWrapper.eq("pid", sysCategory.getPid());
 		//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------end
 
+		queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId());
 		Page<SysCategory> page = new Page<SysCategory>(pageNo, pageSize);
 		IPage<SysCategory> pageList = sysCategoryService.page(page, queryWrapper);
 		result.setSuccess(true);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -197,13 +197,16 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
      */
     @Override
     public List<SysDict> queryDictName(String cut,SysDict sysDict) {
-        QueryWrapper<SysDict> QueryWrapper = new QueryWrapper<>();
+        QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
 		if (CutEnum.CN.getValue().equals(cut)) {
-			QueryWrapper.select("id", "dict_name", "attribute_type").eq("is_tag_dict", 1);
+			queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1);
 		}else{
-			QueryWrapper.select("id", "dict_en_name", "attribute_type").eq("is_tag_dict", 1);
+			queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1);
+			List<SysDict> resetlist = list(queryWrapper);
+			resetlist.stream().forEach(f->f.setDictName(f.getDictEnName()));
+			return resetlist;
 		}
-        return list(QueryWrapper);
+        return list(queryWrapper);
     }
 
     /**

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

@@ -104,7 +104,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@AutoLog(value = "区域管理表-查询展示区域")
 	@ApiOperation(value="区域管理表-查询展示区域", notes="区域管理表-查询展示区域")
 	@GetMapping(value = "/queryShowArea")
-	public Result<List<OnlCgformArea>> queryShowArea(@RequestParam(name = "cut") String cut,OnlCgformArea onlCgformArea){
+	public Result<List<OnlCgformArea>> queryShowArea(@RequestParam(name = "cut") String cut, OnlCgformArea onlCgformArea){
 		List<OnlCgformArea> list = onlCgformAreaService.queryShowArea(cut,onlCgformArea);
 		return Result.OK(list);
 	}

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

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

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

@@ -109,16 +109,18 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 	 * @return
 	 */
 	@Override
-	public List<OnlCgformArea> queryShowArea(String cut,OnlCgformArea onlCgformArea) {
-		QueryWrapper<OnlCgformArea> QueryWrapper = new QueryWrapper<>();
-		if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){
-			if (CutEnum.CN.getValue().equals(cut)) {
-				QueryWrapper.select("id","show_area").orderByAsc("sort");
-			}else{
-				QueryWrapper.select("id","en_name").orderByAsc("sort");
-			}
+	public List<OnlCgformArea> queryShowArea(String cut, OnlCgformArea onlCgformArea) {
+		QueryWrapper<OnlCgformArea> queryWrapper = new QueryWrapper<>();
+		if (CutEnum.CN.getValue().equals(cut)) {
+			queryWrapper.select("id","show_area").orderByAsc("sort");
+			System.out.println("QueryWrapper数据:"+queryWrapper);
+			return list(queryWrapper);
+		}else{
+			queryWrapper.select("id","en_name").orderByAsc("sort");
+			List<OnlCgformArea> resetlist = list(queryWrapper);
+			resetlist.stream().forEach(f->f.setShowArea(f.getEnName()));
+			return resetlist;
 		}
-		return list(QueryWrapper);
 	}
 
 	/**