更新组织机构代码

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysRole.java

@@ -35,7 +35,14 @@ public class SysRole extends BaseEntity
 
     /**数据范围 （1：所有数据权限；2：自定义数据权限；3：本机构数据权限；4：本机构及以下数据权限；5：仅本人数据权限）*/
     private String  dataScope;
-
+    /**
+     * 部门树选择项是否关联显示
+     */
+    private Boolean menuCheckStrictly;
+    /**
+     * 部门树选择项是否关联显示
+     */
+    private Boolean deptCheckStrictly;
     /** 角色状态 （0正常，1停用）*/
     private Integer status;
 
@@ -49,4 +56,8 @@ public class SysRole extends BaseEntity
     /** 角色菜单权限  用于权框架*/
     @TableField(exist = false)
     private Set<String> permissions;
+    /**
+     * 备注
+     */
+    private String remark;
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -76,6 +76,7 @@ public class SysRoleController extends BaseController
             return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(SecurityUtils.getUsername());
+        role.setStatus(0);
         return toAjax(roleService.insertRole(role));
 
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysMenu.java

@@ -86,8 +86,8 @@ public class SysMenu extends BaseEntity {
     /**
      * 平台类型：0。移动端，1web端
      */
-    @ApiModelProperty(value = "平台类型：0。移动端，1web端")
-    private Long platformType;
+  /*  @ApiModelProperty(value = "平台类型：0。移动端，1web端")
+    private Long platformType;*/
 
     /**
      * 菜单类型（M目录 C菜单 F按钮）
@@ -112,7 +112,10 @@ public class SysMenu extends BaseEntity {
      */
     @ApiModelProperty(value = "权限标识")
     private String perms;
-
+    /**
+     * 备注
+     */
+    private String remark;
     /**
      * 菜单图标
      */
@@ -156,8 +159,8 @@ public class SysMenu extends BaseEntity {
                 .append("isCache" , getIsCache())
 
 
-                .append("platformType" , getPlatformType())
-
+              //  .append("platformType" , getPlatformType())
+                .append("remark",getRemark())
 
                 .append("menuType" , getMenuType())
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -244,6 +244,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     public int insertRole(SysRole role)
     {
         // 新增角色信息
+        role.setDelFlag(0);
         roleMapper.insertRole(role);
         return insertRoleMenu(role);
     }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -27,7 +27,7 @@
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
 		from sys_menu
     </sql>
     
@@ -157,7 +157,7 @@
 	
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
-		where menu_id = #{menuId}
+		where id = #{id}
 	</select>
 	
 	<select id="hasChildByMenuId" resultType="Integer">
@@ -189,12 +189,12 @@
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = sysdate()
 		</set>
-		where menu_id = #{menuId}
+		where id = #{id}
 	</update>
 
 	<insert id="insertMenu" parameterType="com.xunmei.system.domain.SysMenu">
 		insert into sys_menu(
-		<if test="menuId != null and menuId != 0">menu_id,</if>
+		<if test="id != null and id != 0">id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
 		<if test="orderNum != null">order_num,</if>
@@ -212,7 +212,7 @@
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		create_time
 		)values(
-		<if test="menuId != null and menuId != 0">#{menuId},</if>
+		<if test="id != null and id != 0">#{id},</if>
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
 		<if test="orderNum != null">#{orderNum},</if>
@@ -233,7 +233,7 @@
 	</insert>
 	
 	<delete id="deleteMenuById" parameterType="Long">
-	    delete from sys_menu where menu_id = #{menuId}
+	    delete from sys_menu where id = #{menuId}
 	</delete>
 
 </mapper> 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
  	<insert id="insertRole" parameterType="com.xunmei.system.api.domain.SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(
- 			<if test="roleId != null and roleId != 0">role_id,</if>
+ 			<if test="id != null and id != 0">id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
  			<if test="roleSort != null">role_sort,</if>
@@ -107,14 +107,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			<if test="roleId != null and roleId != 0">#{roleId},</if>
+ 			<if test="id != null and id != 0">#{id},</if>
  			<if test="roleName != null and roleName != ''">#{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
  			<if test="roleSort != null">#{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
  			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
  			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
- 			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="status != null and status != ''">0,</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			sysdate()