فهرست منبع

最近开发公司绑分机功能接口

peicj 2 روز پیش
والد
کامیت
8836245fa7

+ 8 - 3
ruoyi-admin/src/main/java/com/ruoyi/aicall/controller/ApiController.java

@@ -1289,7 +1289,7 @@ public class ApiController extends BaseController {
         List<CcExtNum> list = ccExtNumService.selectCcExtNumList(ccExtNum);
         if(!CollectionUtils.isEmpty(list)){
             list.forEach(extNum -> {
-                if(StringUtils.isNotBlank(extNum.getUserCode()) && extNum.getUserCode().startsWith("Runtian_")){
+                if(StringUtils.isNotBlank(extNum.getUserCode()) && extNum.getUserCode().startsWith("Runtian_cp_")){
                     extNum.setUserCode("");
                 }
             });
@@ -1405,8 +1405,13 @@ public class ApiController extends BaseController {
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
         int i = userService.updateUser(user);
         if(i>0){
-            //先清除原分机绑定
-            int cleanNum = ccExtNumService.cleanCcExtNumByUserCode(user.getLoginName());
+            int cleanNum;
+            if(StringUtils.isNotBlank(user.getUserSource()) && user.getUserSource().equals("0")){
+                cleanNum = ccExtNumService.updateUserCodeByLoginName(user.getCompanyName(),user.getLoginName());
+            }else{
+                //先清除原分机绑定
+                cleanNum = ccExtNumService.cleanCcExtNumByUserCode(user.getLoginName());
+            }
             if(cleanNum>0){
                 //修改绑定分机
                 CcExtNum extNum = new CcExtNum();

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/cc/mapper/CcExtNumMapper.java

@@ -101,4 +101,8 @@ public interface CcExtNumMapper
     Long selectMaxExtNum();
 
     int companyBatchUnbindSipExt(@Param("extNums") Set<Long> extNums);
+    /**
+     * 销售归还公司分机
+     */
+    int updateUserCodeByLoginName(@Param("companyName") String companyName,@Param("loginName") String loginName);
 }

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/cc/service/ICcExtNumService.java

@@ -111,4 +111,6 @@ public interface ICcExtNumService
     int batchInsertCcExtNum(int count, String extPass, String userCode, Long startExtNum);
 
     int companyBatchUnbindSipExt(Set<Long> extNums);
+
+    int updateUserCodeByLoginName(String companyName, String loginName);
 }

+ 5 - 0
ruoyi-admin/src/main/java/com/ruoyi/cc/service/impl/CcExtNumServiceImpl.java

@@ -352,4 +352,9 @@ public class CcExtNumServiceImpl implements ICcExtNumService
     public int companyBatchUnbindSipExt(Set<Long> extNums) {
         return ccExtNumMapper.companyBatchUnbindSipExt(extNums);
     }
+
+    @Override
+    public int updateUserCodeByLoginName(String companyName, String loginName) {
+        return ccExtNumMapper.updateUserCodeByLoginName(companyName, loginName);
+    }
 }

+ 3 - 0
ruoyi-admin/src/main/resources/mapper/cc/CcExtNumMapper.xml

@@ -128,4 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{extNum}
         </foreach>
     </update>
+    <update id="updateUserCodeByLoginName">
+        update cc_ext_num set user_code = #{companyName} where user_code = #{loginName}
+    </update>
 </mapper>

+ 18 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -111,6 +111,24 @@ public class SysUser extends BaseEntity
 
     /** 分机绑定用户 */
     private String userCode;
+    /** 用户来源0销售 1总后台 */
+    private String userSource;
+    /** 销售公司 */
+    private String companyName;
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setUserSource(String userSource) {
+        this.userSource = userSource;
+    }
+    public String getUserSource() {
+        return userSource;
+    }
+
     public String getUserCode() {
         return userCode;
     }