Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysMenu.java

@@ -69,6 +69,9 @@ public class SysMenu extends BaseEntity
     /** 菜单图标 */
     private String icon;
 
+    /** 备注 */
+    private String remark;
+
     /** 是否新窗口;0:否 1:是 */
     private Integer isNew;
 
@@ -233,6 +236,16 @@ public class SysMenu extends BaseEntity
         this.icon = icon;
     }
 
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
     public Integer getIsNew() { return isNew; }
 
     public void setIsNew(Integer isNew) { this.isNew = isNew; }
@@ -246,7 +259,7 @@ public class SysMenu extends BaseEntity
     {
         this.children = children;
     }
-    
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -263,12 +276,12 @@ public class SysMenu extends BaseEntity
             .append("status ", getStatus())
             .append("perms", getPerms())
             .append("icon", getIcon())
+            .append("remark", getRemark())
+            .append("isNew", getIsNew())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("isNew", getIsNew())
             .toString();
     }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -414,10 +414,6 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
     @Override
     public int updateMenu(SysMenu menu)
     {
-        //变更平台菜单名称或者菜单移动位置更新时根据菜单名称、菜单id和菜单pid条件分别找到两条记录，菜单pid找到对应栏目id（pid）,
-        // 菜单id找到对应的栏目信息，将菜单名称和刚才找到的栏目id（pid）同步处理帮助中心这条栏目记录中的栏目菜单pid和菜单名称字段
-
-
         return menuMapper.updateMenu(menu);
     }
 

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -307,7 +307,7 @@
             <if test="perms !=null">perms = #{perms},</if>
             <if test="icon !=null and icon != ''">icon = #{icon},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
-            <if test="isNew != null and isNew != 0">isNew = #{isNew},</if>
+            <if test="isNew != null">isNew = #{isNew},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>