Merge remote-tracking branch 'origin/master'

guoshilong

2024-02-20 c2fa12a34eab9acf275915f551bf7c7d720ca2b1

 src/main/java/org/springblade/modules/ownersCommittee/service/impl/OwnersCommitteeServiceImpl.java

@@ -29,6 +29,8 @@
import org.springblade.modules.ownersCommittee.mapper.OwnersCommitteeMapper;
import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
import org.springblade.modules.ownersCommittee.vo.OwnersCommitteeVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -80,4 +82,20 @@
      return this.baseMapper.selectOwnersCommitteeList(ownersCommitteeDTO);
   }

   @Override
   public Boolean saveOrUpdateOwnersCommittee(OwnersCommitteeEntity ownersCommittee) {
      boolean b = saveOrUpdate(ownersCommittee);
      if (b) {
         // 更新负责人用户角色
         IUserService bean = SpringUtils.getBean(IUserService.class);
         User userInfo = bean.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, ownersCommittee.getPrincipalId()));
         // 判断角色
         if (!userInfo.getRoleId().contains("1759487358708310017")) {
            userInfo.setRoleId(userInfo.getRoleId() + ",1759487358708310017");
         }
         bean.updateById(userInfo);
      }
      //
      return b;
   }
}