forked from kidgrow-microservices-platform

侯瑞军
2020-04-09 4c517057e540851198b28b6f2134366dc0f2af47
修改区域添加时,区域编号重复检查功能。
4 files modified
17 ■■■■ changed files
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java 7 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/sysArea.html 4 ●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/sysArea_form.html 4 ●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysArea.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,13 +23,12 @@
@NoArgsConstructor
@AllArgsConstructor
@TableName("sys_area")
public class SysArea {
public class SysArea extends Model<SysArea> {
    /**
     * 区域id
     */
    @NotEmpty(message = "区域id不能为空")
    private Long Id;
    private Long id;
    /**
     * 区域名称
     */
@@ -45,7 +45,6 @@
    /**
     * 省市区级别
     */
    @NotEmpty(message = "区域级别不能为空")
    private Integer areaLeveltype;
    /**
     * 区号
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
@@ -80,7 +80,7 @@
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            //如果父级id是空的,默认填-1
            if (sysArea.getAreaParentId().toString()=="") {
            if (sysArea.getAreaParentId()==null) {
                sysArea.setAreaParentId(-1L);
            }
            //添加的时候得判断主键唯一
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/sysArea.html
@@ -32,13 +32,13 @@
</script>
<script>
    layui.use(['form', 'table', 'util', 'config', 'admin', 'formSelects', 'treetable'],function () {
        let table = layui.table;
    layui.use(['form', 'util', 'config', 'admin','treetable','table'],function () {
        let layer = layui.layer;
        let admin = layui.admin;
        let treetable = layui.treetable;
        let config = layui.config;
        let form = layui.form;
        let table=layui.table;
        // 渲染表格
        var renderTable = function (param) {
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/sysArea_form.html
@@ -15,7 +15,7 @@
    <div class="layui-form-item">
        <label class="layui-form-label">区域编号</label>
        <div class="layui-input-block">
            <input id="id" name="id" placeholder="请输入区域编号" type="text" class="layui-input" maxlength="20"
            <input id="Id" name="id" placeholder="请输入区域编号" type="text" class="layui-input" maxlength="20"
                   lay-verify="required" required/>
        </div>
    </div>
@@ -75,6 +75,8 @@
        <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
        <button class="layui-btn" lay-filter="area-form-submit" lay-submit>保存</button>
    </div>
    <input name="enabled"  type="hidden" />
    <input name="isDel"  type="hidden" />
</form>
<script>