供应商

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierContactServiceImpl.java

@@ -200,14 +200,19 @@ public class SupplierContactServiceImpl  extends ServiceImpl<SupplierContactMapp
     public Boolean updateByBo(SupplierContactBo bo) {
         SupplierContact update = MapstructUtils.convert(bo, SupplierContact.class);
         validEntityBeforeSave(update);
-        RemoteUserBo remoteUserBo = new RemoteUserBo();
-        remoteUserBo.setNickName(bo.getUserName());
-        remoteUserBo.setUserName(bo.getPhone());
-        String password = ObjectUtil.isNotEmpty(bo.getPassword()) ? bo.getPassword() : "123456";
-        remoteUserBo.setPassword(BCrypt.hashpw(password));
-        remoteUserBo.setUserSonType("1");
-        remoteUserBo.setTenantId(LoginHelper.getTenantId());
-        Long userId = remoteUserService.editUser(remoteUserBo);
+        if (update.getUserId() != null){
+            RemoteUserBo remoteUserBo = new RemoteUserBo();
+            remoteUserBo.setNickName(bo.getUserName());
+            remoteUserBo.setUserName(bo.getPhone());
+            remoteUserBo.setUserId(update.getUserId());
+            String password = ObjectUtil.isNotEmpty(bo.getPassword()) ? bo.getPassword() : "123456";
+            remoteUserBo.setPassword(BCrypt.hashpw(password));
+            remoteUserBo.setUserSonType("1");
+            remoteUserBo.setTenantId(LoginHelper.getTenantId());
+            remoteUserBo.setStatus(update.getIsRegister() == "0" ? "1" : "0");
+            Long userId = remoteUserService.editUser(remoteUserBo);
+        }
+        update.setStatus(update.getIsRegister() == "0" ? "1" : "0");
         return baseMapper.updateById(update) > 0;
     }
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierInfoServiceImpl.java

@@ -254,6 +254,7 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
         // 2. 添加品牌条件
         if (bo.getOperatingBrand()!= null){
 
+
         }
         LambdaQueryWrapper<SupplierInfo> lqw = buildQueryWrapper(bo);
         Page<SupplierInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);