Merge branch 'master' of liubing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlSystemDictController.java

@@ -64,11 +64,7 @@ public class ZjxlSystemDictController extends BaseController {
            ZjxlSystemDict systemDict = new ZjxlSystemDict();
            systemDict.setSystemDictType(systemDictType);
            //查询分类是否存在
            int systemIsExist = systemDictService.findSystemDictExistByCondition(null,systemDictType,systemDictClassify,null);
            if (systemIsExist>0){
                return write(-1,"该分类已存在，请勿重复添加");
            }
            systemIsExist = systemDictService.findSystemDictExistByCondition(null,systemDictType,systemDictClassify,systemDictSubclassify);
            Integer systemIsExist = systemDictService.findSystemDictExistByCondition(null,systemDictType,systemDictClassify,systemDictSubclassify);
            if (systemIsExist>0){
                return write(-1,"该子分类已存在，请勿重复添加");
            }