From df59cad917c6db1db3b36a23f4b3e7be510e9ed0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 11:20:37 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index b79089e..715ab5c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -194,6 +194,12 @@
                 .eq(SystemUser::getUsername,company.getUsername()))>0){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
         }
+        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+                .eq(SystemUser::getDeleted,Boolean.TRUE)
+                .eq(SystemUser::getMobile,company.getPhone()))>0){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ユ墜鏈哄彿宸插瓨鍦紝璇锋洿鎹㈤噸璇晘");
+        }
+
         SystemUser user = new SystemUser();
         user.setUsername(company.getUsername());
         // 鐢熸垚瀵嗙爜鐩�
@@ -218,6 +224,12 @@
                 .eq(SystemUser::getUsername,company.getUsername()))>0){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
         }
+        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+                .eq(SystemUser::getDeleted,Boolean.TRUE)
+                .ne(SystemUser::getUsername,company.getUsername())
+                .eq(SystemUser::getMobile,company.getPhone()))>0){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ユ墜鏈哄彿宸插瓨鍦紝璇锋洿鏂伴噸璇晘");
+        }
         SystemUser model = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                 .eq(SystemUser::getDeleted,Boolean.TRUE)
                 .eq(SystemUser::getUsername,oldUserName).last("limit 1"));
@@ -240,6 +252,7 @@
             user.setStatus(Constants.ZERO);
             systemUserMapper.insert(user);//鎻掑叆鏂扮殑绠$悊鍛樿处鍙�
         }else{
+            model.setMobile(company.getPhone());
             model.setUsername(company.getUsername());
             model.setCreateUser(company.getCreator());
             model.setCreateTime(company.getCreateDate());
@@ -368,14 +381,14 @@
         }else  {
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺惀涓氭墽鐓э紒");
         }
-        if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
-            multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
-        }else {
+//        if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
+//            multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
+//        }else {
          //   throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
-        }
+//        }
         if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
             for(Multifile f : company.getIdcardImgList()){
-                multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
+                    multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
             }
         }else {
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺韩浠借瘉鎵弿浠讹紒");

--
Gitblit v1.9.3