fix 新增委员信息时，校验是否存在

ruoyi-admin/src/main/java/com/ruoyi/web/controller/member/MemberInfoController.java

@@ -130,7 +130,7 @@ public class MemberInfoController extends BaseController {
     @Log(title = "委员信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MemberInfo memberInfo) {
-        return toAjax(memberInfoService.insertMemberInfo(memberInfo));
+        return memberInfoService.insertMemberInfo(memberInfo);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/IMemberInfoService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service;
 
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.member.MemberInfo;
 import com.ruoyi.system.domain.member.MemberInfoTree;
 import com.ruoyi.system.domain.vo.MemberInfoVo;
@@ -50,7 +51,7 @@ public interface IMemberInfoService
      * @param memberInfo 委员信息
      * @return 结果
      */
-    public int insertMemberInfo(MemberInfo memberInfo);
+    public AjaxResult insertMemberInfo(MemberInfo memberInfo);
 
     /**
      * 修改委员信息

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -173,7 +174,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         proposalInfo.setYear(year);
         List<ProposalInfo> proposalInfos = proposalInfoMapper.selectProposalInfoListByUser(proposalInfo);
         memberInfoVo.setProposalInfoList(proposalInfos);
-        if (proposalInfos != null && proposalInfos.size() >0){
+        if (proposalInfos != null && proposalInfos.size() > 0) {
             map.put("proposalInfoNum", proposalInfos.size());
         }
         //查询社情民意
@@ -182,7 +183,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         sqmyInfo.setYear(year);
         List<SqmyInfo> sqmyInfos = sqmyInfoMapper.selectSqmyInfoList(sqmyInfo);
         memberInfoVo.setSqmyInfoList(sqmyInfos);
-        if (sqmyInfos != null && sqmyInfos.size() >0){
+        if (sqmyInfos != null && sqmyInfos.size() > 0) {
             map.put("sqmyInfoNum", sqmyInfos.size());
         }
 
@@ -192,7 +193,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         zxConference.setYear(year);
         List<ZxConference> zxConferences = zxConferenceMapper.selectZxConferenceList(zxConference);
         memberInfoVo.setZxConferenceList(zxConferences);
-        if (zxConferences != null && zxConferences.size() > 0){
+        if (zxConferences != null && zxConferences.size() > 0) {
             long count = zxConferences.stream().filter(e -> e.getConferenceType().equals(ONE)).count();
             map.put("plenarySessionNum", count);
         }
@@ -202,7 +203,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         zxActivity.setYear(year);
         List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
         memberInfoVo.setZxActivityList(zxActivities);
-        if (zxActivities != null && zxActivities.size() >0){
+        if (zxActivities != null && zxActivities.size() > 0) {
             map.put("activityNum", zxActivities.size());
         }
 
@@ -212,7 +213,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         zxSpeak.setYear(year);
         List<ZxSpeak> zxSpeaks = zxSpeakMapper.selectZxSpeakList(zxSpeak);
         memberInfoVo.setZxSpeakList(zxSpeaks);
-        if (zxSpeaks != null && zxSpeaks.size() >0){
+        if (zxSpeaks != null && zxSpeaks.size() > 0) {
             map.put("speakNum", zxSpeaks.size());
         }
         //查询委员得分和排名
@@ -220,10 +221,10 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         memberAssessmentInfo.setUserId(userId);
         memberAssessmentInfo.setYear(year);
         List<MemberAssessmentInfo> memberAssessmentInfos = memberAssessmentInfoMapper.selectMemberAssessmentInfoList(memberAssessmentInfo);
-        if (memberAssessmentInfos != null && memberAssessmentInfos.size() >0){
+        if (memberAssessmentInfos != null && memberAssessmentInfos.size() > 0) {
             MemberAssessmentInfo memberAssessmentInfoNew = memberAssessmentInfos.get(0);
             memberInfoVo.setMemberAssessmentInfo(memberAssessmentInfoNew);
-        }else {
+        } else {
             memberInfoVo.setMemberAssessmentInfo(new MemberAssessmentInfo());
         }
         memberInfoVo.setMap(map);
@@ -280,10 +281,16 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
      * @return 结果
      */
     @Override
-    public int insertMemberInfo(MemberInfo memberInfo) {
-        memberInfo.setUserId(SecurityUtils.getUserId());
+    public AjaxResult insertMemberInfo(MemberInfo memberInfo) {
+        Long userId = SecurityUtils.getUserId();
+        MemberInfo memberInfoNew = memberInfoMapper.selectMemberInfoByUserId(userId);
+        if (memberInfoNew != null) {
+            return AjaxResult.error("当前委员信息已存在");
+        }
+        memberInfo.setUserId(userId);
         memberInfo.setCreateTime(DateUtils.getNowDate());
-        return memberInfoMapper.insertMemberInfo(memberInfo);
+        memberInfoMapper.insertMemberInfo(memberInfo);
+        return AjaxResult.success();
     }
 
     /**
@@ -323,8 +330,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
     @Override
     @Transactional
     public String importData(List<MemberInfo> list, boolean updateSupport, String operName) {
-        if (StringUtils.isNull(list) || list.size() == 0)
-        {
+        if (StringUtils.isNull(list) || list.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -332,14 +338,11 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (MemberInfo member : list)
-        {
-            try
-            {
+        for (MemberInfo member : list) {
+            try {
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(member.getPhonenumber());
-                if (StringUtils.isNull(u))
-                {
+                if (StringUtils.isNull(u)) {
                     SysUser user = new SysUser();
                     user.setDeptId(100L);
                     user.setUserName(member.getPhonenumber());
@@ -353,34 +356,27 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
                     userMapper.insertUser(user);
                     //新增角色
                     Long[] roleIds = {3L};
-                    insertUserRole(user.getUserId(),roleIds);
+                    insertUserRole(user.getUserId(), roleIds);
                     //新增委员
                     member.setUserId(user.getUserId());
                     member.setCreateTime(DateUtils.getNowDate());
                     memberInfoMapper.insertMemberInfo(member);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                }
-                else
-                {
+                } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + member.getPhonenumber() + " 已存在");
                 }
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、账号 " + member.getPhonenumber() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }
-        if (failureNum > 0)
-        {
+        if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
-        }
-        else
-        {
+        } else {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();
@@ -389,17 +385,14 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
     /**
      * 新增用户角色信息
      *
-     * @param userId 用户ID
+     * @param userId  用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds)
-    {
-        if (StringUtils.isNotEmpty(roleIds))
-        {
+    public void insertUserRole(Long userId, Long[] roleIds) {
+        if (StringUtils.isNotEmpty(roleIds)) {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
-            for (Long roleId : roleIds)
-            {
+            for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);