Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/domain/entity/SysMenu.java

@@ -48,21 +48,23 @@ public class SysMenu extends BaseEntity
     @Excel(name = "路由参数")
     private String query;
 
-    /** 是否为外链（0是 1否） */
+    /**
+     * 是否为外链（1是 2否）
+     */
     private String isFrame;
 
-    /** 是否缓存（0缓存 1不缓存） */
+    /** 是否缓存（1缓存 2不缓存） */
     private String isCache;
 
     /** 类型（M目录 C菜单 F按钮） */
     @Excel(name = "类型", readConverterExp = "M=目录,C=菜单,F=按钮")
     private String menuType;
 
-    /** 显示状态（0显示 1隐藏） */
+    /** 显示状态（1显示 2隐藏） */
     private String visible;
 
-    /** 菜单状态（0正常 1停用） */
-    @Excel(name = "菜单状态", readConverterExp = "0=正常,1=停用")
+    /** 菜单状态（1正常 2停用） */
+    @Excel(name = "菜单状态", readConverterExp = "1=正常,2=停用")
     private String status;
 
     /** 权限字符串 */

base-framework/src/main/java/com/ozs/framework/aspectj/LogAspect.java

@@ -82,7 +82,7 @@ public class LogAspect {
             operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
             if (loginUser != null) {
                 operLog.setUserId(loginUser.getUsername());
-                operLog.setDeptName(deptService.getById(loginUser.getDeptId()).getDeptName());
+                operLog.setDeptName(deptService.selectDeptById(loginUser.getDeptId()).getDeptName());
             }
 
             if (e != null) {

base-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -53,6 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
 		</if>
+		<if test="status != null and status != ''">
+			AND status = #{status}
+		</if>
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>

base-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -97,9 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
             r.status, r.del_flag, r.create_time, r.remark,r.update_by,r.update_time
         from sys_role r
-	         join sys_user_role ur on ur.role_id = r.role_id
-	         join sys_user u on u.id = ur.user_id
-	         join sys_dept d on u.dept_id = d.dept_id
+	         left  join sys_user_role ur on ur.role_id = r.role_id
+	         left join sys_user u on u.id = ur.user_id
 		<where>
 			<if test="roleName != null and roleName != ''">
 				and r.role_name like concat('%', #{roleName}, '%')
@@ -143,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+		    <if test="updateBy != null and updateBy != ''">update_by,</if>
  			create_time
  		)values(
  			<if test="roleId != null and roleId != 0">#{roleId},</if>
@@ -155,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+		    <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
  			sysdate()
  		)
 	</insert>