Merge branch 'feature-haoban-role' of…

Merge branch 'feature-haoban-role' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature-haoban-role

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -567,6 +567,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 
     @Override
     public List<String> listUnBindClerk(String storeId) {
+        if (StringUtils.isBlank(storeId)) {
+            logger.error("门店id为空");
+            return Collections.emptyList();
+        }
         List<String> storeIds = new ArrayList<String>();
         storeIds.add(storeId);
         List<String> clerkList = clerkService.getclerkListByStoreIds(storeIds);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

@@ -106,6 +106,7 @@ public class HaobanRoleController extends WebBaseController {
         HaobanRoleDTO haobanRoleDTO = haobanRoleDTOServiceResponse.getResult();
         if (haobanRoleDTO != null) {
             List<String> oldMenuCodes = haobanRoleDTO.getMenuCodes();
+
             //新勾选的
             List<String> differenceCodesList = RolesListUtils.differenceList(oldMenuCodes, menuCodes);
             for (String menuCode : differenceCodesList) {
@@ -114,6 +115,8 @@ public class HaobanRoleController extends WebBaseController {
                 String log = RoleClerkTypeEnum.getNameByCode(clerkType) + "/" + menuName + "/" + "勾选" + "\r\n";
                 stringBuffer.append(log);
             }
+
+            //删除勾选的
             for (String menuCode : delMenuCodes) {
                 ServiceResponse<String> serviceMenuNameByCode = haobanMenuApiService.getMenuNameByCode(menuCode);
                 String menuName = serviceMenuNameByCode.getResult();