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

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/res/FindCooperateByEntResVo.java

@@ -86,5 +86,10 @@ public class FindCooperateByEntResVo implements Serializable {
      */
     private String targetPhone;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -513,7 +513,7 @@ public class KwmCooperateManageService {
         for (KwmCooperate kwmCooperate : kwmCooperates) {
             FindCooperateByEntResVo findCooperateByEntResVo = new FindCooperateByEntResVo();
             findCooperateByEntResVo.setId(kwmCooperate.getId());
-
+            findCooperateByEntResVo.setRemark(kwmCooperate.getRemark());
             //设置合作属性
             List<KwmCooperateType> kwmCooperateTypes1 = collect.get(kwmCooperate.getId());
             if (CollectionUtils.isNotEmpty(kwmCooperateTypes1)) {

sckw-modules/sckw-system/pom.xml

@@ -67,6 +67,10 @@
             <artifactId>sckw-common-log</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-transport-api</artifactId>
+        </dependency>
 
     </dependencies>
     <build>

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -3,12 +3,16 @@ package com.sckw.system.controller;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.annotation.RepeatSubmit;
+import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.redis.constant.RedisConstant;
+import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.model.KwsUser;
 import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
@@ -27,6 +31,7 @@ import java.util.List;
 
 /**
  * 用户
+ *
  * @author zk
  * @date 2023-05-30
  */
@@ -166,6 +171,12 @@ public class KwsUserController {
     public HttpResult register(@Valid @RequestBody RegisterReqDto reqVo,
                                @RequestHeader(name = "System-Type", required = true) int systemType) {
         reqVo.setSystemType(systemType);
+
+        String key = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, DictEnum.SMS_REGISTER.getValue(), reqVo.getPhone());
+        String sms = RedissonUtils.getString(key);
+        if (!reqVo.getCaptcha().equals(sms)) {
+            throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
+        }
         kwsUserService.register(reqVo);
         return HttpResult.ok(HttpStatus.MSG_007);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindEntUserPojo.java

@@ -47,4 +47,9 @@ public class FindEntUserPojo implements Serializable {
      */
     private String phone;
 
+    /**
+     * 角色名
+     */
+    private String roleName;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -21,7 +21,9 @@ import com.sckw.system.dubbo.RemoteSystemServiceImpl;
 import com.sckw.system.model.*;
 import com.sckw.system.model.vo.req.*;
 import com.sckw.system.model.vo.res.KwsUserResVo;
+import com.sckw.transport.api.dubbo.TransportStatisticsService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -70,6 +72,9 @@ public class KwsUserService {
     @Autowired
     private CommonService commonService;
 
+    @DubboReference(version = "1.0.0", group = "design", check = false)
+    private TransportStatisticsService transportStatisticsService;
+
     /**
      * @param reqVo 入参
      * @desc: 新增
@@ -115,12 +120,6 @@ public class KwsUserService {
      */
     @Transactional(rollbackFor = {})
     public RegisterResDto register(RegisterReqDto reqDto) {
-//        String key = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, DictEnum.SMS_REGISTER.getValue(), reqDto.getPhone());
-//        String sms = RedissonUtils.getString(key);
-//        if (!reqDto.getCaptcha().equals(sms)) {
-//            throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
-//        }
-
         commonService.checkEntRepeat(reqDto.getEntName(), reqDto.getPhone());
         /*1、数据校验*/
         checkAccountValid(reqDto.getPhone(), reqDto.getSystemType());
@@ -608,11 +607,10 @@ public class KwsUserService {
     }
 
     public List<AreaTreeFrontResDto> test(List<Integer> list) {
-
+        Integer integer = transportStatisticsService.statisticsLogistics(123L);
 
         List<Long> longs = LoginUserHolder.getAuthUserIdList();
 
-//        PageResult pageResult = remoteUserService.queryEntInfoByCityCodeAndEntTypesWithPage(null, Collections.singletonList(1), 1, 10);
         return null;
     }
 

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -99,9 +99,14 @@
       </foreach>
     </if>
     where a.del_flag = 0
-    <if test="dto.approval != null">
-      and a.approval = #{dto.approval}
-    </if>
+      <choose>
+        <when test="dto.approval != null and dto.approval == 3">
+          and a.approval in (3,4)
+        </when>
+        <when test="dto.approval != null and dto.approval != 3">
+          and a.approval = #{dto.approval}
+        </when>
+      </choose>
     <if test="dto.keywords != null">
       and (a.contacts like concat('%', #{dto.keywords}, '%') or a.phone like concat('%', #{dto.keywords}, '%') or a.firm_name like concat('%', #{dto.keywords}, '%'))
     </if>
@@ -209,15 +214,19 @@
            d.id userId,
            d.name,
            d.account,
-           d.phone
+           d.phone,
+           f.name roleName
       from kws_enterprise a
       left join kws_dept b on a.id = b.ent_id
       left join kws_user_dept c on b.id = c.dept_id
       left join kws_user d on c.user_id = d.id
+      left join kws_user_role e on d.id = e.user_id
+      left join kws_role f on e.role_id = f.id
      where a.del_flag = 0
        and b.del_flag = 0
        and c.del_flag = 0
        and d.del_flag = 0
+       and f.del_flag = 0
        and a.id in
         <foreach collection="list" separator="," open="(" close=")" item="item">
           #{item}