修改商户添加

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java

@@ -209,4 +209,8 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 
 	@Select("select * from sys_depart where del_flag = '0' and org_code= #{orgCode}")
 	SysDepart findByOrgCode(@Param("orgCode") String orgCode);
+
+	@Select("select * from sys_depart where del_flag=0 and org_category ='10' and depart_name =#{merchantName}")
+	SysDepart findByDepartName(@Param("merchantName") String merchantName);
+
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -221,7 +221,7 @@
     <select id="findMerchantPage"  resultType="org.jeecg.modules.system.app.dto.merchant.FindMerchantResponseDTO">
         select sd.id, sd.depart_name as merchantName, su.realname,su.phone,sd.create_time from  sys_depart  sd
         left join  sys_user su on sd.id = su.depart_ids
-        where sd.del_flag=0 and sd.org_category =1 and su.del_flag=0
+        where sd.del_flag=0 and sd.org_category =10 and su.del_flag=0
         <if test="orgCode!=null and orgCode!=''">
             and sd.org_code like CONCAT('',#{orgCode},'%')
         </if>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -1592,15 +1592,17 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         if (sysUserMapper.insert(sysUser) < 1) {
             return Result.error("添加商户信息失败");
         }
-        SysDepart sysDepart = new SysDepart();
         String deptId = departMapper.queryDepartIdByOrgCode(loginUser.getOrgCode());
-
+        SysDepart sysDepart = departMapper.findByDepartName(addMerchantRequestDTO.getMerchantName());
+        if (sysDepart==null){
+            sysDepart = new SysDepart();
+        }
         if (StringUtils.isNotEmpty(deptId)) {
             sysDepart.setParentId(deptId);
         }
         sysDepart.setDirectorUserIds(sysUser.getId());
         sysDepart.setDepartName(addMerchantRequestDTO.getMerchantName());
-        sysDepart.setOrgCategory("1");//创建商户类型
+        sysDepart.setOrgCategory("10");//创建商户类型
         this.saveDepartData(sysDepart, addMerchantRequestDTO.getPhone());
         sysUser.setOrgCode(sysDepart.getOrgCode());
         if (sysUserMapper.updateById(sysUser) < 1) {