Merge remote-tracking branch 'origin/master'

jd-logistics-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -210,10 +210,10 @@ public class SysLoginService
         }
 
         SysUser sysUser = new SysUser();
-        String username = phoneNumber.getData();
+        String phone = phoneNumber.getData();
         String openId = openIdData.getData();
         sysUser.setOpenId(openId);
-        sysUser.setPhonenumber(username);
+        sysUser.setPhonenumber(phone);
         // 查询用户信息
         R<LoginUser> userResult = remoteUserService.getUserByOpenId(sysUser, SecurityConstants.INNER);
 
@@ -226,15 +226,15 @@ public class SysLoginService
         SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+            recordLogService.recordLogininfor(phone, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+            throw new ServiceException("对不起，您的账号：" + phone + " 已被删除");
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+            recordLogService.recordLogininfor(phone, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+            throw new ServiceException("对不起，您的账号：" + phone + " 已停用");
         }
-        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+        recordLogService.recordLogininfor(phone, Constants.LOGIN_SUCCESS, "登录成功");
         //recordLoginInfo(user.getUserId());
         recordLoginInfoAndPolicy(user);
         return userInfo;

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/Kd100Controller.java

@@ -1,6 +1,7 @@
 package com.ruoyi.front.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.front.service.impl.Kuaidi100Service;
 import org.slf4j.Logger;
@@ -70,6 +71,10 @@ public class Kd100Controller {
     @PostMapping("/queryIcrExpres")
     public Map queryIcrExpres(@RequestBody Map param)  {
         try {
+            if(StringUtils.isBlank(param.get("param").toString())){
+                return AjaxResult.error("智能识别文字不能为空！");
+
+            }
                 Map   result = kuaidi100Service.queryIcrExpres(param);
                 return  result;
         } catch (Exception e) {

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/WxMiniController.java

@@ -62,7 +62,7 @@ public class WxMiniController {
         SysUser currentUser = sysUserService.selectUserByOpenId(sysUser);
         if (StringUtils.isNull(currentUser))
         {
-            currentUser = sysUserService.selectUserByUserName(sysUser.getUserName());
+            currentUser = sysUserService.selectUserByPhoneNumber(sysUser.getPhonenumber());
             if (StringUtils.isNull(currentUser))
             {
                 return R.fail("用户不存在");

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/domain/dto/DeptImportDTO.java

@@ -30,11 +30,11 @@ public class DeptImportDTO {
     private String parentDeptCode;
 
     /** 负责人手机号 */
-    @Excel(name = "*负责人手机号")
+    @Excel(name = "负责人手机号")
     private String phone;
 
     /** 负责人姓名 */
-    @Excel(name = "*负责人姓名")
+    @Excel(name = "负责人姓名")
     private String leader;
 
     /** 费率 */

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -77,6 +77,14 @@ public interface SysDeptMapper
      */
     public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
 
+    /**
+     * 校验部门编码是否唯一
+     *
+     * @param deptCode 部门编码
+     * @return 结果
+     */
+    public SysDept checkDeptCodeUnique(@Param("deptCode") String deptCode);
+
     /**
      * 新增部门信息
      * 

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -128,8 +128,16 @@ public interface SysUserMapper
     /**
      * 通过微信openId查询用户
      *
-     * @param userName 用户名
+     * @param phoneNumber 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByOpenId(@Param("phoneNumber") String phoneNumber, @Param("openId") String openId);
+
+    /**
+     * 通过手机号查询用户
+     *
+     * @param phoneNumber 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserByOpenId(@Param("userName") String userName, @Param("openId") String openId);
+    public SysUser selectUserByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -222,4 +222,12 @@ public interface ISysUserService
      * @return 用户对象信息
      */
     public SysUser selectUserByOpenId( SysUser sysUser);
+
+    /**
+     * 通过手机号码查询用户
+     *
+     * @param phoneNumber 手机号码
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByPhoneNumber(String phoneNumber);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.constant.UserConstants;
@@ -29,6 +30,7 @@ import com.ruoyi.system.service.ISysDeptService;
  * 
  * @author lydgt
  */
+@Slf4j
 @Service
 public class SysDeptServiceImpl implements ISysDeptService
 {
@@ -362,13 +364,18 @@ public class SysDeptServiceImpl implements ISysDeptService
                 SysDept dept = convertToSysDept(importDTO);
 
                 // 根据父组织编码和名称查询父部门 ID
-                SysDept parentId = deptMapper.selectDeptByInfo(importDTO.getParentDeptCode(), importDTO.getParentDeptName());
+                SysDept parentId = null;
+                if (StringUtils.isNotBlank(importDTO.getParentDeptCode()) && StringUtils.isNotBlank(importDTO.getParentDeptName())) {
+                    parentId = deptMapper.selectDeptByInfo(importDTO.getParentDeptCode(), importDTO.getParentDeptName());
+                }
 
                 // 设置父部门 ID，如果为 null 则默认为顶级部门（0）
                 dept.setParentId(parentId == null ? 0L : parentId.getDeptId());
 
-                // 检查部门名称是否唯一
-                if (null != deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId())) {
+                if (null != deptMapper.checkDeptCodeUnique(dept.getDeptCode())) {
+                    failureNum++;
+                    failureMsg.append(String.format("%1$s、部门已存在；", dept.getDeptCode()));
+                } else if (null != deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId())) {
                     failureNum++;
                     failureMsg.append(String.format("%1$s、部门已存在；", dept.getDeptName()));
                 } else {
@@ -378,6 +385,7 @@ public class SysDeptServiceImpl implements ISysDeptService
                     successMsg.append(String.format("%1$s、导入成功；", dept.getDeptName()));
                 }
             } catch (Exception e) {
+                log.info("导入部门数据异常", e);
                 failureNum++;
                 String msg = String.format("%1$s、导入失败：%2$s", importDTO.getDeptName(), e.getMessage());
                 failureMsg.append(msg);

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -603,7 +603,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     @Override
     public SysUser selectUserByOpenId(SysUser sysUser) {
-        return userMapper.selectUserByOpenId(sysUser.getUserName(), sysUser.getOpenId());
+        return userMapper.selectUserByOpenId(sysUser.getPhonenumber(), sysUser.getOpenId());
     }
 
     /**
@@ -702,4 +702,9 @@ public class SysUserServiceImpl implements ISysUserService
         user.setCreateTime(DateUtils.getNowDate());
         return user;
     }
+
+    @Override
+    public SysUser selectUserByPhoneNumber(String phoneNumber) {
+        return userMapper.selectUserByPhoneNumber(phoneNumber);
+    }
 }

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -95,6 +95,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectDeptVo"/>
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
+
+	<select id="checkDeptCodeUnique" resultMap="SysDeptResult">
+	    <include refid="selectDeptVo"/>
+		where dept_code=#{deptCode} and del_flag = '0' limit 1
+	</select>
     
     <insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(
@@ -114,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   			<if test="openBank != null and openBank != ''">open_bank,</if>
   			<if test="bankAccount != null and bankAccount != ''">bank_account,</if>
   			<if test="companyAddress != null and companyAddress != ''">company_address,</if>
-            <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
+            <if test="deptCode != null and deptCode != ''">dept_code,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -200,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
 			<if test="loginFirstDate != null">login_first_date = #{loginFirstDate},</if>
 			<if test="agreeFlag != null">agree_flag = #{agreeFlag},</if>
+            <if test="openId != null">open_id = #{openId},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
@@ -230,6 +231,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectUserByOpenId" parameterType="String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.phonenumber = #{userName} and u.open_id = #{openId} and u.del_flag = '0'
+        where u.phonenumber = #{phoneNumber} and u.open_id = #{openId} and u.del_flag = '0'
+    </select>
+
+    <select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where u.phonenumber = #{phoneNumber} and u.del_flag = '0'
     </select>
 </mapper>