Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -385,15 +385,11 @@ public class AdminUserLogic {
                 adminUser.setType(1);
             } else {
                 if (!addWebsit) {
-                    if (!curAdminUser.getType().equals(AdminWebsitTypeEnum.A.getKey()) && StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.A.getKey())) {
+                    if (curAdminUser.getType() != 2 && StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.A.getKey())) {
                         throw new RemoteServiceException("暂无权限创建当前网点的账号");
                     }
                     if (StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.C.getKey())) {
                         adminUser.setType(0);
-                    } else if (StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.B.getKey())) {
-                        adminUser.setType(1);
-                    } else if (StringUtils.equals(adminWebsit.getType(), AdminWebsitTypeEnum.A.getKey())) {
-                        adminUser.setType(2);
                     }
                 }
             }
@@ -402,7 +398,7 @@ public class AdminUserLogic {
         if (!addWebsit && !CollectionUtils.isEmpty(adminUser.getAdminDeptId())) {
             AdminDept adminDept = adminDeptService.getById(adminUser.getAdminDeptId().get(0));
 
-            if (!curAdminUser.getType().equals("2") && adminDept.getAdminDeptId().equals("1")) {
+            if (curAdminUser.getType() != 2 && adminDept.getAdminDeptId().equals("1")) {
                 throw new RemoteServiceException("不可选高于商户得平台权限");
             }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WorkerStockLogic.java

@@ -17,6 +17,7 @@ import com.gree.mall.manager.bean.material.stock.WorkerStockDTO;
 import com.gree.mall.manager.bean.material.worker.OldRefundManageBean;
 import com.gree.mall.manager.bean.material.worker.OldRefundManageItemBean;
 import com.gree.mall.manager.commonmapper.CommonMapper;
+import com.gree.mall.manager.enums.ExamineWorkerStatusEnum;
 import com.gree.mall.manager.enums.UserTypeEnum;
 import com.gree.mall.manager.enums.material.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -78,9 +79,15 @@ public class WorkerStockLogic {
             List<WebsitUser> workerList = websitUserService.lambdaQuery()
                     .eq(StringUtils.isNotBlank(adminUser.getCompanyWechatId()), WebsitUser::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .in(WebsitUser::getWebsitId, zfireParamBean.getAdminWebsitIds())
-                    .groupBy(WebsitUser::getWorkerNumber)
+                    .in(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey(), ExamineWorkerStatusEnum.EXPIRED.getKey(), ExamineWorkerStatusEnum.OVERDUE.getKey(), ExamineWorkerStatusEnum.STOP.getKey())
+                    .groupBy(WebsitUser::getUserId)
                     .list();
-            workers = workerList.stream().map(WebsitUser::getWorkerNumber).collect(Collectors.toList());
+            List<String> userIds = workerList.stream().map(WebsitUser::getUserId).collect(Collectors.toList());
+            final List<User> userList = userService.lambdaQuery()
+                    .in(User::getUserId, userIds)
+                    .groupBy(User::getIdCard)
+                    .list();
+            workers = userList.stream().map(User::getIdCard).collect(Collectors.toList());
         }
         IPage<WorkerStockVO> page = commonMapper.workerStockList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, workers);
         return page;

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -222,12 +222,12 @@
         join worker_goods b on a.goods_id = b.goods_id
         left join websit_goods_category c on b.parent_category_id = c.category_id
         left join websit_goods_category d on b.goods_category_id = d.category_id
-        left join user e on e.worker_number = a.worker_id
+        left join user e on e.id_card = a.identity
           ${ex.query}
           and a.goods_type='M'
             <if test="workers != null and workers.size > 0">
                 AND (
-                a.worker_id IN
+                a.identity IN
                 <foreach item="item" index="index" collection="workers" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -244,7 +244,7 @@
         join worker_goods b on a.goods_id = b.goods_id
         left join websit_goods_category c on b.parent_category_id = c.category_id
         left join websit_goods_category d on b.goods_category_id = d.category_id
-        left join user e on e.worker_number = a.worker_id
+        left join user e on e.id_card = a.identity
         ${ex.query}
         and a.goods_type='M'
         <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">