标签修改

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

@@ -116,8 +116,8 @@ public class SysCategoryController {
 	  * @param
 	  * @return
 	  */
-	 @AutoLog(value = "标签内容-树形结构-通过sysDictId查询")
+	 @AutoLog(value = "标签内容-树形结构-通过名称查询")
-	 @ApiOperation(value="标签内容-树形结构-通过sysDictId查询", notes="标签内容-树形结构-通过sysDictId查询")
+	 @ApiOperation(value="标签内容-树形结构-通过名称查询", notes="标签内容-树形结构-通过名称查询")
 	 @GetMapping(value = "/queryBySysName")
 	 public Result<?> queryBySysName(@RequestParam(name="id",required=true) String sysName) {
 		 List<SysCategory> sysCategory = sysCategoryService.queryBySysName(sysName);
@@ -136,7 +136,6 @@ public class SysCategoryController {
 	public Result<SysCategory> add(@RequestBody SysCategory sysCategory) {
 		Result<SysCategory> result = new Result<SysCategory>();
 		try {
-			sysCategory.setDelFlag(CommonConstant.DEL_FLAG_0);
 			sysCategoryService.addSysCategory(sysCategory);
 			result.success("添加成功！");
 		} catch (Exception e) {

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

@@ -76,6 +76,7 @@ public class SysDictController {
 												@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
 		Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
 		QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
+		queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0);
 		Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
 		IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
 		log.debug("查询当前页："+pageList.getCurrent());

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

@@ -55,7 +55,7 @@ public class SysDictItemController {
 													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
 		QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
-		queryWrapper.orderByAsc("sort_order");
+		queryWrapper.orderByAsc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0);
 		Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
 		IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
 		result.setSuccess(true);

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

@@ -72,5 +72,5 @@ public interface ISysCategoryService extends IService<SysCategory> {
 	 */
 	List<SysCategoryTreeVO> getSysCategoryTree();
 
-    List<SysCategory> queryBySysName(String sysName);
+    List<SysCategory> queryBySysName(String sysDictId);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.FillRuleConstant;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.FillRuleUtil;
@@ -59,6 +60,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 		//update-end--Author:baihailong  Date:20191209 for：分类字典编码规则生成器做成公用配置
 		sysCategory.setCode(categoryCode);
 		sysCategory.setPid(categoryPid);
+		sysCategory.setDelFlag(CommonConstant.DEL_FLAG_0);
 		baseMapper.insert(sysCategory);
 	}
 
@@ -215,14 +217,14 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 	@Override
 	public List<SysCategory> queryBySysDictId(String sysDictId) {
 		QueryWrapper<SysCategory> queryWrapper=new QueryWrapper<>();
-		queryWrapper.eq("sys_dict_id",sysDictId);
+		queryWrapper.eq("sys_dict_id",sysDictId).eq("del_flag", CommonConstant.DEL_FLAG_0);
 		return list(queryWrapper);
 	}
-
+/**搜索条件*/
 	@Override
 	public List<SysCategory> queryBySysName(String sysName) {
 		QueryWrapper<SysCategory> queryWrapper=new QueryWrapper<>();
-		queryWrapper.like("name",sysName);
+		queryWrapper.like("name",sysName).eq("del_flag", CommonConstant.DEL_FLAG_0);
 		return list(queryWrapper);
 	}
 	@Override

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java

@@ -86,10 +86,10 @@ public class OnlCgformTag implements Serializable {
     @ApiModelProperty(value = "字段英文名称描述")
     private java.lang.String dbFieldEnName;
 
-    /**表单控件类型*/
+    /**属性类型*/
-    @Excel(name = "表单控件类型", width = 15,dicCode ="field_show_type")
+    @Excel(name = "属性类型", width = 15,dicCode ="field_show_type")
     @Dict(dicCode ="field_show_type")
-    @ApiModelProperty(value = "表单控件类型")
+    @ApiModelProperty(value = "属性类型")
     private java.lang.String fieldShowType;
 
     @TableField(exist = false)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java

@@ -27,6 +27,7 @@ public interface OnlCgformTagMapper extends BaseMapper<OnlCgformTag> {
             "left join sys_dict_item as i on f.field_show_type=i.item_value\n" +
             "left join onl_cgform_area as a on f.show_area=a.id\n" +
             "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" +
+            "and f.is_delete=0\n" +
             "and i.dict_id=1493098515761917954 \n" +
             "order by f.create_time desc ")
     IPage<OnlCgformTag> queryPageList(IPage page,@Param("params") Map<String,Object> params);