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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/BaseModel.java

@@ -1,6 +1,7 @@
 package com.sckw.core.model.base;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -26,6 +27,7 @@ public class BaseModel implements Serializable {
 	/**
 	 * 备注
 	 */
+	@Size(max = 200, message = "备注长度不能超过200")
 	private String remark;
 
 	/**

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/ContractCommonInfoResDto.java

@@ -42,6 +42,16 @@ public class ContractCommonInfoResDto implements Serializable {
      */
     private String signingWayName;
 
+    /**
+     * 合同状态
+     */
+    private Integer status;
+
+    /**
+     * 合同状态名称
+     */
+    private String statusName;
+
     /**
      * 企业id
      */

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/RemoteFleetService.java

@@ -2,6 +2,8 @@ package com.sckw.fleet.api;
 
 import com.sckw.fleet.api.model.vo.RDriverVo;
 import com.sckw.fleet.api.model.vo.RTruckVo;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,7 +19,7 @@ public interface RemoteFleetService {
      * @author zk
      * @date 2023/7/18
      **/
-    Map<Long, RDriverVo> findDriver(String driverIds);
+    Map<Long, RDriverVo> findDriver(List<Long> driverIds);
 
     /**
      * @param truckNos 车牌号，多个已逗号隔开
@@ -25,5 +27,5 @@ public interface RemoteFleetService {
      * @author zk
      * @date 2023/7/18
      **/
-    Map<Long, RTruckVo> findTruck(String truckNos);
+    Map<String, RTruckVo> findTruck(List<String> truckNos);
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/dubbo/RemoteContractServiceImpl.java

@@ -11,6 +11,7 @@ import com.sckw.contract.model.entity.KwcContractLogistics;
 import com.sckw.contract.model.entity.KwcContractLogisticsUnit;
 import com.sckw.contract.model.entity.KwcContractTrade;
 import com.sckw.contract.service.KwcContractLogisticsUnitService;
+import com.sckw.core.model.enums.ContractStatusEnum;
 import com.sckw.core.model.enums.SigningWayEnum;
 import com.sckw.core.utils.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -59,6 +60,8 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         contractCommonInfoResDto.setSigningWay(kwcContractLogistics.getSigningWay());
         contractCommonInfoResDto.setSigningWayName(SigningWayEnum.getName(kwcContractLogistics.getSigningWay()).getName());
         contractCommonInfoResDto.setEntInfoList(entList);
+        contractCommonInfoResDto.setStatus(kwcContractLogistics.getStatus());
+        contractCommonInfoResDto.setStatusName(ContractStatusEnum.getName(kwcContractLogistics.getStatus()).getName());
         List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitService.queryByContractId(kwcContractLogistics.getId());
         if (CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)) {
             for (KwcContractLogisticsUnit kwcContractLogisticsUnit : kwcContractLogisticsUnits) {
@@ -81,6 +84,8 @@ public class RemoteContractServiceImpl implements RemoteContractService {
         contractCommonInfoResDto.setSigningWay(kwcContractTrade.getSigningWay());
         contractCommonInfoResDto.setSigningWayName(SigningWayEnum.getName(kwcContractTrade.getSigningWay()).getName());
         contractCommonInfoResDto.setEntInfoList(entList);
+        contractCommonInfoResDto.setStatus(kwcContractTrade.getStatus());
+        contractCommonInfoResDto.setStatusName(ContractStatusEnum.getName(kwcContractTrade.getStatus()).getName());
         List<KwcContractLogisticsUnit> kwcContractLogisticsUnits = kwcContractLogisticsUnitService.queryByContractId(kwcContractTrade.getId());
         if (CollectionUtils.isNotEmpty(kwcContractLogisticsUnits)) {
             for (KwcContractLogisticsUnit kwcContractLogisticsUnit : kwcContractLogisticsUnits) {

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/LogisticsBaseInfoReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.contract.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -53,12 +54,14 @@ public class LogisticsBaseInfoReqVo implements Serializable {
      * 合同编号
      */
     @NotBlank(message = "合同编号不能为空")
+    @Size(max = 20, message = "合同编号超长")
     private String contractCode;
 
     /**
      * 合同名称
      */
     @NotBlank(message = "合同名称不能为空")
+    @Size(max = 20, message = "合同名称超长")
     private String contractName;
 
     /**
@@ -77,4 +80,5 @@ public class LogisticsBaseInfoReqVo implements Serializable {
      */
     @NotNull(message = "生效时间不能为空")
     private Date startTime;
+
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -84,6 +84,13 @@ public class KwcContractLogisticsService {
      */
     @Transactional(rollbackFor = {})
     public Long addCheckedContract(ContractLogisticsReqVo reqVo) {
+        Long id = reqVo.getId();
+        //不为空时是修改
+        if (Objects.nonNull(id)) {
+            update(reqVo);
+            return id;
+        }
+
         LogisticsBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
 
         //创建合同

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -13,6 +13,7 @@ import com.sckw.contract.model.vo.req.*;
 import com.sckw.contract.model.vo.res.*;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ContractStatusEnum;
@@ -132,7 +133,7 @@ public class KwcContractTradeService {
     public Long addTradeContract(ContractTradeReqVo reqVo) {
         TradeBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
         List<TradeGoodsInfoReqVo> goodsInfoList = reqVo.getGoodsInfo();
-
+        checkParams(reqVo,baseInfo);
         //创建合同
         KwcContractTrade kwcContractTrade = getKwcContractTrade(baseInfo, reqVo.getRemark(), reqVo.getPId());
         long contactId = new IdWorker(1L).nextId();
@@ -354,7 +355,7 @@ public class KwcContractTradeService {
         if (Objects.isNull(kwcContractTrade)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
-
+        checkParams(reqVo,reqVo.getBaseInfo());
         KwcContractTrade param = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getRemark(), reqVo.getPId());
         param.setId(contractId);
         param.setSigningUrl(reqVo.getContractFile());
@@ -513,6 +514,15 @@ public class KwcContractTradeService {
         }
         return list;
     }
+
+    private void checkParams(ContractTradeReqVo param,TradeBaseInfoReqVo baseInfo) {
+        if (Objects.isNull(baseInfo.getContractCode()) && baseInfo.getContractCode().length() > 20) {
+            throw new BusinessException("合同编号不能为空且最长20字符！");
+        }
+        if (Objects.isNull(baseInfo.getContractName()) && baseInfo.getContractName().length() > 20) {
+            throw new BusinessException("合同名称不能为空且最长20字符！");
+        }
+    }
 }
 
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -35,7 +35,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
      * @date 2023/7/18
      **/
     @Override
-    public Map<Long, RDriverVo> findDriver(String driverIds) {
+    public Map<Long, RDriverVo> findDriver(List<Long> driverIds) {
         /**获取数据**/
         Map<Long, RDriverVo> driverMap = new HashMap();
         List<Map<String, Object>> drivers = driverDao.findList(new HashMap(){{put("ids", driverIds);}});
@@ -66,9 +66,9 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
      * @date 2023/7/18
      **/
     @Override
-    public Map<Long, RTruckVo> findTruck(String truckNos) {
+    public Map<String, RTruckVo> findTruck(List<String> truckNos) {
         /**获取数据**/
-        Map<Long, RTruckVo> truckMap = new HashMap();
+        Map<String, RTruckVo> truckMap = new HashMap();
         List<Map<String, Object>> trucks = truckDao.findList(new HashMap(){{put("truckNos", truckNos);}});
         if (CollectionUtils.isEmpty(trucks)) {
             return truckMap;
@@ -85,7 +85,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
             truckVo.setTotalTake(truck.get("totalTake") != null ? Integer.parseInt(String.valueOf(truck.get("totalTake"))) : null);
             truckVo.setTotalWeight(truck.get("totalWeight") != null ? new BigDecimal(Double.parseDouble(String.valueOf(truck.get("totalWeight")))) : null);
             truckVo.setBusinessStatus(truck.get("businessStatus") != null ? Integer.parseInt(String.valueOf(truck.get("businessStatus"))) : null);
-            truckMap.put(truckVo.getId(), truckVo);
+            truckMap.put(truckVo.getTruckNo(), truckVo);
         }
 
         return truckMap;

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -121,9 +121,6 @@
         from kwf_driver dr
         left join kwf_driver_ent dre on dre.driver_id = dr.id
         where dr.del_flag = 0 and dre.del_flag = 0
-        <if test="ids != null and ids != ''">
-            and FIND_IN_SET(dr.id, #{ids, jdbcType=VARCHAR})
-        </if>
         <if test="entId != null and entId != ''">
             and dre.ent_id = #{entId, jdbcType=VARCHAR}
         </if>
@@ -144,6 +141,14 @@
                 select driver_id from kwf_truck_report where del_flag = 0 and ent_id = #{entId, jdbcType=VARCHAR}
             )
         </if>
+        <choose>
+            <when test="ids != null">
+                and dr.id in
+                <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                    #{id,jdbcType=BIGINT}
+                </foreach>
+            </when>
+        </choose>
         <if test="keywords != null and keywords != ''">
             and (
             dr.name like concat('%',#{keyWords},'%')

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -123,9 +123,6 @@
         from kwf_truck tr
         left join kwf_truck_ent tre on tre.truck_id = tr.id
         where tr.del_flag = 0 and tre.del_flag = 0
-        <if test="truckNos != null and truckNos != ''">
-            and FIND_IN_SET(tr.truck_no, #{truckNos, jdbcType=VARCHAR})
-        </if>
         <if test="entId != null and entId != ''">
             and tre.ent_id = #{entId, jdbcType=VARCHAR}
         </if>
@@ -150,6 +147,14 @@
         <if test="endTime != null and endTime != '' " >
             and DATE( tr.create_time ) <![CDATA[ <= ]]> #{endTime,jdbcType=TIMESTAMP}
         </if>
+        <choose>
+            <when test="truckNos != null">
+                and tr.truck_no in
+                <foreach collection="truckNos" item="truckNo" open="(" close=")" separator=",">
+                    #{truckNo,jdbcType=VARCHAR}
+                </foreach>
+            </when>
+        </choose>
         <if test="keywords != null and keywords != ''">
             and (
             tr.truck_no like concat('%',#{keywords},'%')

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/AddressAddReqVo.java

@@ -1,5 +1,7 @@
 package com.sckw.manage.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -24,6 +26,8 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 区域名
      */
+    @NotBlank(message = "区域名不能为空")
+    @Size(max = 50, message = "区域名超长")
     private String cityName;
 
     /**
@@ -64,6 +68,7 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/BindManagerReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.manage.model.vo.req;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -19,11 +20,13 @@ public class BindManagerReqVo implements Serializable {
     /**
      * 用户id
      */
+    @NotNull(message = "用户id不能为空")
     private Long userId;
 
     /**
      * 主键id
      */
+    @NotNull(message = "id不能为空")
     private Long id;
 
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/CooperateApproveReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.manage.model.vo.req;
 
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -29,6 +30,7 @@ public class CooperateApproveReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/IdsReqVo.java

@@ -1,6 +1,7 @@
 package com.sckw.manage.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -28,5 +29,6 @@ public class IdsReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/InitiateReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.manage.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -33,6 +34,7 @@ public class InitiateReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**

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

@@ -184,7 +184,7 @@ public class KwsEnterpriseController {
      * @date 2023/06/02
      **/
     @PostMapping(value = "/freeze")
-    public HttpResult freeze(@RequestBody FreezeReqVo reqVo) {
+    public HttpResult freeze(@Valid @RequestBody FreezeReqVo reqVo) {
         kwsEntService.freeze(reqVo);
         return HttpResult.ok(HttpStatus.MSG_005);
     }

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

@@ -30,7 +30,7 @@ public class KwsMenuController {
      * @date 2023/5/30
      **/
     @GetMapping("/detail")
-    public HttpResult selectByKey(@RequestParam("id")Long id) throws SystemException {
+    public HttpResult selectByKey(@RequestParam("id") Long id) throws SystemException {
         return HttpResult.ok(kwsMenuService.selectByKey(id));
     }
 
@@ -70,7 +70,7 @@ public class KwsMenuController {
      * @date 2023/5/30
      **/
     @PostMapping("/update")
-    public HttpResult update(@RequestBody KwsMenu params) throws SystemException {
+    public HttpResult update(@Valid @RequestBody KwsMenu params) throws SystemException {
         kwsMenuService.update(params);
         return HttpResult.ok(HttpStatus.MSG_005);
     }
@@ -83,7 +83,7 @@ public class KwsMenuController {
      * @date 2023/5/30
      **/
     @PostMapping("/dels")
-    public HttpResult del(@RequestBody DelsMenuReqVo ids) throws SystemException {
+    public HttpResult del(@Valid @RequestBody DelsMenuReqVo ids) throws SystemException {
         kwsMenuService.deleteByKey(ids.getIds());
         return HttpResult.ok(HttpStatus.MSG_008);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsMenu.java

@@ -3,6 +3,7 @@ package com.sckw.system.model;
 import com.sckw.core.model.base.BaseModel;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -29,6 +30,7 @@ public class KwsMenu extends BaseModel {
      * 名称
      */
     @NotBlank(message = "菜单名不能为空")
+    @Size(max = 50, message = "名称长度超长")
     private String name;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/ApprovalReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -30,6 +31,7 @@ public class ApprovalReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注长度不能超过200")
     private String remark;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/DelsMenuReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
@@ -19,5 +20,6 @@ public class DelsMenuReqVo implements Serializable {
     /**
      * 主键id
      */
+    @NotBlank(message = "id不能为空")
     private String ids;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EditRoleReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.system.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -23,6 +24,8 @@ public class EditRoleReqVo implements Serializable {
     /**
      * 角色名称
      */
+    @NotBlank(message = "岗位名称不能为空！")
+    @Size(max = 50, message = "名称超长")
     private String name;
 
     /**
@@ -49,5 +52,6 @@ public class EditRoleReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntRegisterReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.system.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -111,6 +112,7 @@ public class EntRegisterReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注长度不能超过200")
     private String remark;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/FindListReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -14,6 +15,7 @@ public class FindListReqVo implements Serializable {
     /**
      * 企业id
      */
+    @NotNull(message = "企业不能为空")
     private Long id;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/FreezeReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,11 +11,13 @@ public class FreezeReqVo implements Serializable {
     /**
      * 企业id
      */
-    private long id;
+    @NotNull(message = "企业不能为空")
+    private Long id;
 
     /**
      * 状态0正常1锁定
      */
-    private int status;
+    @NotNull(message = "状态不能为空")
+    private Integer status;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/UserAddReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.system.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -43,6 +44,7 @@ public class UserAddReqVo implements Serializable {
      * 姓名
      */
     @NotBlank(message = "姓名不能为空")
+    @Size(max = 50, message = "姓名超长")
     private String name;
 
     /**
@@ -85,6 +87,7 @@ public class UserAddReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 50, message = "备注超长")
     private String remark;
 
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.RegularUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.model.EntCertificateInfo;
@@ -55,4 +56,18 @@ public class CommonService {
         }
     }
 
+
+    /**
+     * @param phone 手机号
+     * @desc: 校验手机号
+     * @author: czh
+     * @date: 2023/7/26
+     */
+    public void checkPhone(String phone) {
+        if (!RegularUtils.matchs(RegularUtils.PHONE_REG, phone)) {
+            throw new SystemException(HttpStatus.PARAMETERS_PATTERN_ERROR_CODE, HttpStatus.CONTACTS_PHONE_ERROR);
+        }
+    }
+
+
 }

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

@@ -201,6 +201,13 @@ public class KwsEnterpriseService {
 //        });
     }
 
+    /**
+     * @param id 主键id
+     * @return  KwsEntCertificate
+     * @desc: 查资质
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public KwsEntCertificate checkEntCertificate(long id) throws SystemException {
         KwsEntCertificate kwsEntCertificate = kwsEntCertificateDao.selectByKey(id);
         if (Objects.isNull(kwsEntCertificate) || kwsEntCertificate.getDelFlag() == Global.YES) {
@@ -277,6 +284,13 @@ public class KwsEnterpriseService {
         return list;
     }
 
+    /**
+     * @param reqVo 分页入参
+     * @return FindEntListPojo
+     * @desc: 分页查企业信息
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public List<FindEntListPojo> findPojo(EntFindPageReqVo reqVo) {
         FindPojoParam findPojoParam = new FindPojoParam();
         BeanUtils.copyProperties(reqVo, findPojoParam);
@@ -457,10 +471,15 @@ public class KwsEnterpriseService {
                 kwsUserService.fillUserRole(String.valueOf(findManagePojo.getRoleId()), userByAccount.getId(), SystemTypeEnum.COMPANY.getCode());
             }
         }
-
-
     }
 
+    /**
+     * @param id 主键id
+     * @return KwsEnterprise
+     * @desc: 查企业
+     * @author: czh
+     * @date: 2023/7/26
+     */
     private KwsEnterprise checkKwsEnterpriseById(long id) throws SystemException {
         KwsEnterprise kwsEnterprise = queryKwsEnterpriseById(id);
         if (Objects.isNull(kwsEnterprise) || kwsEnterprise.getDelFlag() == Global.YES) {
@@ -469,6 +488,13 @@ public class KwsEnterpriseService {
         return kwsEnterprise;
     }
 
+    /**
+     * @param id 主键
+     * @return KwsEnterprise
+     * @desc: 放开接口
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public KwsEnterprise queryKwsEnterpriseById(long id) {
         return kwsEnterpriseDao.selectByKey(id);
     }
@@ -581,7 +607,6 @@ public class KwsEnterpriseService {
      * @date: 2023/7/25
      */
     private void checkAddEntSettleParam(AddEntSettleReqVo reqVo) {
-
         List<BusinessLicense> businessLicenseList = reqVo.getBusinessLicense();
         for (BusinessLicense businessLicense : businessLicenseList) {
             Integer type = businessLicense.getType();
@@ -700,6 +725,13 @@ public class KwsEnterpriseService {
         return findListGroupResVo;
     }
 
+    /**
+     * @param id 企业id
+     * @return EntDetailResVo
+     * @desc: 查详情
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public EntDetailResVo detail(Long id) {
         KwsEnterprise kwsEnterprise = selectByKey(id);
         if (Objects.isNull(kwsEnterprise)) {
@@ -714,6 +746,13 @@ public class KwsEnterpriseService {
         return entDetailResVo;
     }
 
+    /**
+     * @param reqVo 入参
+     * @return FindEntUserPojo
+     * @desc: 查企业用户
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public List<FindEntUserPojo> findEntUser(FindListReqVo reqVo) {
         List<FindEntUserPojo> list = kwsEnterpriseDao.findUserByEntIds(Collections.singletonList(reqVo.getId()));
         if (CollectionUtils.isEmpty(list)) {

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

@@ -71,6 +71,7 @@ public class KwsUserService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void add(UserAddReqVo reqVo) {
+        commonService.checkPhone(reqVo.getAccount());
         KwsUser kwsUser = new KwsUser();
         BeanUtils.copyProperties(reqVo, kwsUser);
         kwsUser.setPhone(kwsUser.getAccount());
@@ -271,6 +272,7 @@ public class KwsUserService {
      */
     @Transactional(rollbackFor = {})
     public void update(UserAddReqVo params) throws SystemException {
+        commonService.checkPhone(params.getAccount());
         KwsUser kwsUser = kwsUserDao.selectByKey(params.getId());
         if (Objects.isNull(kwsUser)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);