Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/wx/WxUserInfoController.java

@@ -28,10 +28,10 @@ public class WxUserInfoController {
     private UserManagerService userManagerService;
 
     @ApiOperation("查询个人信息")
-    @GetMapping("getUserInfoWx/{userId}")
-    public BaseResponse<GetUserInfoWxRes> getUserInfoWx(@PathVariable("userId") Long userId){
+    @GetMapping("getUserInfoWx")
+    public BaseResponse<GetUserInfoWxRes> getUserInfoWx(){
         //查询单个用户信息
-        GetUserInfoWxRes result = userManagerService.getUserInfoWx(userId);
+        GetUserInfoWxRes result = userManagerService.getUserInfoWx();
         //包装出参
         return BaseResponse.create(result);
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdatePhoneEmailWxReq.java

@@ -19,10 +19,6 @@ import java.io.Serializable;
 @ApiModel
 public class UpdatePhoneEmailWxReq implements Serializable {
 
-    @NotNull(message = "用户id为空")
-    @ApiModelProperty(value = "用户id")
-    private Long id;
-
     @NotEmpty(message = "手机号为空")
     @Pattern(regexp = "^1[0-9]{10}$", message = "手机格式不正确，请重新输入")
     @ApiModelProperty(value = "手机号")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/UserManagerService.java

@@ -71,11 +71,10 @@ public interface UserManagerService {
     /**
      * 根据id查询单个用户信息（小程序）
      *
-     * @param userInfoId
      * @return
      * @throws Exception
      */
-    GetUserInfoWxRes getUserInfoWx(Long userInfoId);
+    GetUserInfoWxRes getUserInfoWx();
 
     /**
      * 更新手机号和邮箱（小程序）

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -223,7 +223,7 @@ public class FactoryServiceImpl implements FactoryService {
             BaseFactory factory = baseFactoryMapper.selectById(id);
             AssertUtil.isNull(factory, "供应商不存在");
             if (!ValidEnum.VALID.is(factory.getValid())) {
-                return;
+                continue;
             }
 
             //只要和当前供应商绑定的（包含启用禁用状态），都不能禁用（码包，箱码幅面，用户)

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxCodeFormatImpl.java

@@ -4,6 +4,7 @@ import com.abi.qms.platform.dao.entity.QrBoxCodeFormat;
 import com.abi.qms.platform.dao.entity.QrBoxCodeFormatSplit;
 import com.abi.qms.platform.dao.enums.FactoryTypeEnum;
 import com.abi.qms.platform.dao.enums.StateEnum;
+import com.abi.qms.platform.dao.enums.TrueFalseEnum;
 import com.abi.qms.platform.dao.mapper.QrBoxCodeFormatMapper;
 import com.abi.qms.platform.dao.mapper.QrBoxCodeFormatSplitMapper;
 import com.abi.qms.platform.dao.vo.result.QrBoxCodeFormatVO;
@@ -61,11 +62,17 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
         } else {
             qrBoxCodeFormat = new QrBoxCodeFormat();
         }
+        //若当前登录用户为包材厂用户，则该选项默认选择该用户所在的包材厂，不可修改
+        UserUtil.UserBean user = userUtil.getWholeUser();
+        if(!TrueFalseEnum.TRUE.is(user.getIsAbi())
+                && !FactoryTypeEnum.BEER.is(user.getFactoryType())
+                && user.getFactoryId()!=null && user.getFactoryId().equals(req.getFactoryId())){
+            throw new BusinessException("包材厂数据异常");
+        }
 
         //2-箱码幅面放入数据
         qrBoxCodeFormat.setQrRepertoryId(req.getQrRepertoryId());
-        //若当前登录用户为包材厂用户，则该选项默认选择该用户所在的包材厂，不可修改
-        qrBoxCodeFormat.setFactoryId(userUtil.getWholeUser().getFactoryId() != null ? userUtil.getWholeUser().getFactoryId() : req.getFactoryId());
+        qrBoxCodeFormat.setFactoryId(req.getFactoryId());
         qrBoxCodeFormat.setName(req.getName());
         qrBoxCodeFormat.setColorPerRollScalar(req.getColorPerRollScalar());
         qrBoxCodeFormat.setFormatNumber(req.getFormatNumber());
@@ -116,7 +123,8 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
     @Override
     public ListBoxCodeFormatRes listBoxCodeFormat(ListBoxCodeFormatReq req) {
         //数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
-        if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && !FactoryTypeEnum.BEER.is(userUtil.getWholeUser().getFactoryType())) {
+        UserUtil.UserBean user = userUtil.getWholeUser();
+        if (!TrueFalseEnum.TRUE.is(user.getIsAbi()) && !FactoryTypeEnum.BEER.is(user.getFactoryType()) && user.getFactoryId() != null) {
             req.setFactoryId(userUtil.getWholeUser().getFactoryId());
         }
         //分页查询

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -491,7 +491,8 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Override
     public ListQrPackageRes listQrPackage(ListQrPackageReq req) {
         // 数据权限隔离，如果登录账号是包材厂，只能看账号包材厂的数据。否则看全部
-        if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && !FactoryTypeEnum.BEER.is(userUtil.getWholeUser().getFactoryType())) {
+        UserUtil.UserBean user = userUtil.getWholeUser();
+        if (!TrueFalseEnum.TRUE.is(user.getIsAbi()) && !FactoryTypeEnum.BEER.is(user.getFactoryType()) && user.getFactoryId() != null) {
             req.setFactoryCoverId(userUtil.getWholeUser().getFactoryId());
         }
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserManagerServiceImpl.java

@@ -261,9 +261,9 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
     }
 
     @Override
-    public GetUserInfoWxRes getUserInfoWx(Long userInfoId) {
+    public GetUserInfoWxRes getUserInfoWx() {
         //查询用户
-        UserInfo userInfo = userInfoMapper.selectById(userInfoId);
+        UserInfo userInfo = userInfoMapper.selectById(userUtil.getUser().getId());
 
         //构造出参
         GetUserInfoWxRes getUserInfoWxRes = PojoConverterUtils.copy(userInfo,GetUserInfoWxRes.class);
@@ -276,13 +276,11 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
     @Transactional(rollbackFor = Exception.class)
     public void updatePhoneEmailWx(UpdatePhoneEmailWxReq req) {
         //0-校验入参
-        UserInfo userInfo = userInfoMapper.selectById(req.getId());
-        if(Objects.isNull(userInfo)){
-            throw new BusinessException("该用户不存在。");
-        }
+        UserInfo userInfo = userInfoMapper.selectById(userUtil.getUser().getId());
+        AssertUtil.isNull(userInfo, "该用户不存在。");
         userInfo.setEmail(req.getEmail());
         userInfo.setPhone(req.getPhone());
-        userInfo.setUpdateBy(userUtil.getWholeUser().getId());
+        userInfo.setUpdateBy(userUtil.getUser().getId());
         userInfoMapper.updateById(userInfo);
     }