he2802 пре 4 година
родитељ
комит
b938c8144c

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorCategoryController.java

@@ -116,7 +116,7 @@ public class MajorCategoryController extends BaseController {
             String content = "修改分类:"+bo.getCategoryName();
             return AjaxResult.success_log(id,content);
         }
-        return toAjax(iMajorCategoryService.updateByEditBo(bo) ? 1 : 0);
+        return AjaxResult.error();
     }
 
     /**

+ 1 - 1
zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysRole.java

@@ -69,7 +69,7 @@ public class SysRole implements Serializable
     private boolean deptCheckStrictly;
 
     /** 角色状态(0正常 1停用) */
-    @ApiModelProperty(value ="状态 0=正常,1=停用")
+    @ApiModelProperty(value ="状态 1=正常,0=停用")
     @Value("1")
     @Excel(name = "角色状态", readConverterExp = "1=正常,0=停用")
     private String status;

+ 6 - 6
zhongzheng-system/src/main/resources/mapper/modules/system/SysMenuMapper.xml

@@ -62,7 +62,7 @@
                         m.create_time
         from sys_menu m
         where m.menu_type in ('M', 'C')
-          and m.status = 0
+          and m.status = '1'
         order by m.parent_id, m.order_num
     </select>
 
@@ -81,7 +81,7 @@
             AND visible = #{visible}
         </if>
         <if test="status != null and status != ''">
-            AND status = #{status}
+            AND m.status = #{status}
         </if>
         order by m.parent_id, m.order_num
     </select>
@@ -108,8 +108,8 @@
                  left join sys_user u on ur.user_id = u.user_id
         where u.user_id = #{userId}
           and m.menu_type in ('M', 'C')
-          and m.status = 0
-          AND ro.status = 0
+          and m.status = 1
+          AND ro.status = 1
         order by m.parent_id, m.order_num
     </select>
 
@@ -138,8 +138,8 @@
                  left join sys_role_menu rm on m.menu_id = rm.menu_id
                  left join sys_user_role ur on rm.role_id = ur.role_id
                  left join sys_role r on r.role_id = ur.role_id
-        where m.status = '0'
-          and r.status = '0'
+        where m.status = '1'
+          and r.status = '1'
           and ur.user_id = #{userId}
     </select>