Commit ce6225d8 by jinxin

好办小程序菜单权限bug修复

parent bd16c618
...@@ -58,6 +58,6 @@ public interface TabHaobanRoleMenuMapper { ...@@ -58,6 +58,6 @@ public interface TabHaobanRoleMenuMapper {
@Param("roleId") Long roleId, @Param("roleId") Long roleId,
@Param("menuCodes") List<String> menuCodes); @Param("menuCodes") List<String> menuCodes);
int deleteByMenuCode(@Param("menuCode") String menuCode, @Param("wxEnterpriseId") String wxEnterpriseId); int deleteByMenuCodeAndRoleId(@Param("menuCode") String menuCode, @Param("wxEnterpriseId") String wxEnterpriseId,@Param("roleId") Long roleId);
} }
...@@ -150,7 +150,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -150,7 +150,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) { if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) {
List<String> delMenuCodes = clerkMenus.getDelMenuCodes(); List<String> delMenuCodes = clerkMenus.getDelMenuCodes();
for (String delMenuCode : delMenuCodes) { for (String delMenuCode : delMenuCodes) {
haobanRoleMenuService.deleteByMenuCode(delMenuCode, wxEnterpriseId); //需要删除好办后台的菜单按钮
HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 0, systemFlag);
if (haobanRoleBO != null){
haobanRoleMenuService.deleteByMenuCodeAndRoleId(delMenuCode, wxEnterpriseId,haobanRoleBO.getRoleId());
}
} }
} }
} }
...@@ -165,7 +169,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -165,7 +169,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) { if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) {
List<String> delMenuCodes = manegeClerkMenus.getDelMenuCodes(); List<String> delMenuCodes = manegeClerkMenus.getDelMenuCodes();
for (String delMenuCode : delMenuCodes) { for (String delMenuCode : delMenuCodes) {
haobanRoleMenuService.deleteByMenuCode(delMenuCode, wxEnterpriseId); //需要删除好办后台的菜单按钮
HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 1, systemFlag);
if (haobanRoleBO != null){
haobanRoleMenuService.deleteByMenuCodeAndRoleId(delMenuCode, wxEnterpriseId,haobanRoleBO.getRoleId());
}
} }
} }
} }
...@@ -180,7 +188,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService { ...@@ -180,7 +188,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) { if (systemFlag == 0 && !"-1".equals(wxEnterpriseId)) {
List<String> delMenuCodes = managerMenus.getDelMenuCodes(); List<String> delMenuCodes = managerMenus.getDelMenuCodes();
for (String delMenuCode : delMenuCodes) { for (String delMenuCode : delMenuCodes) {
haobanRoleMenuService.deleteByMenuCode(delMenuCode, wxEnterpriseId); //需要删除好办后台的菜单按钮
HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, 2, systemFlag);
if (haobanRoleBO != null){
haobanRoleMenuService.deleteByMenuCodeAndRoleId(delMenuCode, wxEnterpriseId,haobanRoleBO.getRoleId());
}
} }
} }
} }
......
...@@ -73,10 +73,11 @@ public interface HaobanRoleMenuService { ...@@ -73,10 +73,11 @@ public interface HaobanRoleMenuService {
* *
* @param menuCode 菜单代码 * @param menuCode 菜单代码
* @param wxEnterpriseId wx企业标识 * @param wxEnterpriseId wx企业标识
* @param roleId 角色id
* @return boolean * @return boolean
* @author mozhu * @author mozhu
* @date 2022-10-10 10:44:23 * @date 2022-10-10 10:44:23
*/ */
boolean deleteByMenuCode(String menuCode,String wxEnterpriseId); boolean deleteByMenuCodeAndRoleId(String menuCode,String wxEnterpriseId,Long roleId);
} }
...@@ -50,7 +50,7 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService { ...@@ -50,7 +50,7 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
@Override @Override
public boolean deleteByMenuCode(String menuCode, String wxEnterpriseId) { public boolean deleteByMenuCodeAndRoleId(String menuCode, String wxEnterpriseId,Long roleId) {
return tabHaobanRoleMenuMapper.deleteByMenuCode(menuCode, wxEnterpriseId) > 0; return tabHaobanRoleMenuMapper.deleteByMenuCodeAndRoleId(menuCode, wxEnterpriseId,roleId) > 0;
} }
} }
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
</foreach> </foreach>
</select> </select>
<delete id="deleteByMenuCode"> <delete id="deleteByMenuCodeAndRoleId">
delete from tab_haoban_role_menu where wx_enterprise_id = #{wxEnterpriseId} and menu_code = #{menuCode} delete from tab_haoban_role_menu where wx_enterprise_id = #{wxEnterpriseId} and menu_code = #{menuCode} and role_id = #{roleId}
</delete> </delete>
</mapper> </mapper>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment