fixed 系统角色权限问题优化

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -186,7 +186,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         Page<MtUser> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtUser> wrapper = Wrappers.lambdaQuery();
         wrapper.ne(MtUser::getStatus, StatusEnum.DISABLE.getKey());
-        wrapper.ne(MtUser::getIsStaff, YesOrNoEnum.NO.getKey());
+        wrapper.eq(MtUser::getIsStaff, YesOrNoEnum.NO.getKey());
         String name = paginationRequest.getSearchParams().get("name") == null ? "" : paginationRequest.getSearchParams().get("name").toString();
         if (StringUtils.isNotBlank(name)) {
             wrapper.like(MtUser::getName, name);
@@ -364,6 +364,9 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         mtUser.setUpdateTime(time);
         mtUser.setStartTime(mtUser.getStartTime());
         mtUser.setEndTime(mtUser.getEndTime());
+        if (mtUser.getIsStaff() == null) {
+            mtUser.setIsStaff(YesOrNoEnum.NO.getKey());
+        }
         if (mtUser.getStoreId() != null) {
             mtUser.setStoreId(mtUser.getStoreId());
         } else {

fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.enums.StatusEnum;
+import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.service.MemberService;
 import com.fuint.common.service.SendSmsService;
 import com.fuint.common.service.StaffService;
@@ -151,6 +152,7 @@ public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implem
             userInfo.setDescription("系统自动注册店铺员工账号");
             userInfo.setStoreId(mtStaff.getStoreId());
             userInfo.setMerchantId(mtStaff.getMerchantId());
+            userInfo.setIsStaff(YesOrNoEnum.TRUE.getKey());
             mtUser = memberService.addMember(userInfo);
             if (mtUser != null) {
                 mtStaff.setUserId(mtUser.getId());

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -302,6 +302,7 @@ public class BackendMemberController extends BaseController {
         memberInfo.setDescription(description);
         memberInfo.setStartTime(DateUtil.parseDate(startTime));
         memberInfo.setEndTime(DateUtil.parseDate(endTime));
+        memberInfo.setIsStaff(YesOrNoEnum.NO.getKey());
         if (StringUtil.isNotEmpty(storeId)) {
             memberInfo.setStoreId(Integer.parseInt(storeId));
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMerchantController.java

@@ -222,11 +222,14 @@ public class BackendMerchantController extends BaseController {
         if (StringUtil.isEmpty(name)) {
             return getFailureResult(201, "商户名称不能为空");
         } else {
-            MtMerchant tempDto = merchantService.queryMerchantByName(name);
-            if (null != tempDto && !tempDto.getId().equals(merchantId)) {
+            MtMerchant merchant = merchantService.queryMerchantByName(name);
+            if (null != merchant && !merchant.getId().equals(merchantId)) {
                 return getFailureResult(201, "该商户名称已经存在");
             }
         }
+        if (merchantId <= 0 && accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            return getFailureResult(201, "抱歉，您没有添加商户的权限");
+        }
 
         // 修改商户信息
         if (merchantId > 0) {

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java

@@ -214,6 +214,7 @@ public class ClientSignController extends BaseController {
         mtUser.setSex(GenderEnum.MAN.getKey());
         mtUser.setMobile("");
         mtUser.setDescription("会员自行注册新账号");
+        mtUser.setIsStaff(YesOrNoEnum.NO.getKey());
         MtUser userInfo = memberService.addMember(mtUser);
 
         if (userInfo != null) {