Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/resources/application.yml

@@ -10,5 +10,5 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid,test
-#    active: prod
+#    active: druid,test
+    active: prod

purchase-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -8,6 +8,7 @@ import javax.validation.Validator;
 
 import com.ozs.common.config.PurchaseConfig;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.common.utils.uuid.IdUtils;
 import com.ozs.system.domain.SysPost;
 import com.ozs.system.domain.SysUserPost;
 import com.ozs.system.domain.SysUserRole;
@@ -556,11 +557,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public int saveUser(SysUser user) {
-        return 0;
+        // 新增用户信息
+        int rows = userMapper.insertUser(user);
+        // 新增用户与角色管理
+        insertUserRole(user);
+        return rows;
     }
 
     @Override
     public int updateUsers(SysUser user) {
-        return 0;
+        // 删除用户与角色关联
+        userRoleMapper.deleteUserRoleByUserId(user.getUserId());
+        // 新增用户与角色管理
+        insertUserRole(user);
+        return userMapper.updateUser(user);
     }
 }