linwe
2023-12-01 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -18,9 +18,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -101,7 +100,7 @@
    * @return
    */
   @Override
   public List<TreeNode> selectPlaceNodeList(Long userId) {
   public List<TreeStringNode> selectPlaceNodeList(Long userId) {
      return baseMapper.selectPlaceNodeList(userId.toString());
   }
@@ -159,19 +158,29 @@
         userParams.setPhone(placeVO.getPhone());
         User user = userService.getOne(Condition.getQueryWrapper(userParams));
         if (user != null) {
         if (null!=user) {
            //如果用户存在,则该用户id绑定场所
            placeVO.setPrincipalUserId(user.getId());
            newUser = user;
            // 判断用户是否包含了居民角色,不包含则需更新
            if (!user.getRoleId().contains("1717429059648606209")){
               user.setRoleId(user.getRoleId() + ",1717429059648606209");
               //更新
               userService.updateById(user);
            }
         } else {
            //如果用户不存在,则新增一个用户
            newUser.setAccount(placeVO.getPhone());
            newUser.setPhone(placeVO.getPhone());
            newUser.setName(placeVO.getUsername());
            newUser.setRealName(placeVO.getUsername());
            // 目前暂定居民角色,默认密码为 123456
            // 社区群众部门
            newUser.setDeptId("1727979636479037441");
            // 目前暂定居民角色,
            newUser.setRoleId("1717429059648606209");
            //默认密码为 123456
            newUser.setPassword("123456");
            // 设置机构
            // 用户新增
            boolean submit = userService.submit(newUser);
            //绑定id