红德堂-用户注册fsUser状态调整、字典值重复判断

fs-company-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -171,7 +171,7 @@ public class WxCompanyUserController extends AppBaseController {
      */
     private FsUser createUser(LoginMaWxParam param, WxMaJscode2SessionResult session, WxMaPhoneNumberInfo phoneNoInfo, Company company, CompanyUser companyUser) {
         FsUser user = new FsUser();
-        user.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
+        user.setStatus(1);
         user.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
         user.setCreateTime(new Date());
         if (param.getAuthType() == 1 && phoneNoInfo != null) {

fs-service/src/main/java/com/fs/system/service/impl/SysDictDataServiceImpl.java

@@ -2,6 +2,7 @@ package com.fs.system.service.impl;
 
 import java.util.List;
 
+import com.fs.common.exception.ServiceException;
 import com.fs.system.vo.DictVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -85,6 +86,12 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     @Override
     public int insertDictData(SysDictData data)
     {
+        // 数据库数据已经有问题了，唯一索引创建不了，在这个地方 dict_value dict_type 查询有记录不允许插入
+        SysDictData label = dictDataMapper.selectDictDataByTypeAndValue(data.getDictType(), data.getDictValue());
+        if(label != null) {
+            throw new ServiceException("字典数据已经存在,请更换数据键值");
+        }
+
         int row = dictDataMapper.insertDictData(data);
         if (row > 0)
         {

fs-user-app/src/main/java/com/fs/app/controller/WxH5MpController.java

@@ -202,7 +202,6 @@ public class WxH5MpController {
 //            newUser.setCompanyUserId(companyUser.getUserId());
             newUser.setUnionId(wxMpUser.getUnionId());
             newUser.setCreateTime(new Date());
-            newUser.setStatus(company != null && company.getFsUserIsDefaultBlack() == 1 ? 0 : 1);
             userService.insertFsUser(newUser);
 
             return newUser;

fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserLoginController.java

@@ -190,7 +190,7 @@ public class CourseFsUserLoginController extends AppBaseController {
      */
     private FsUser createUser(LoginMaWxParam param, WxMaJscode2SessionResult session, WxMaPhoneNumberInfo phoneNoInfo, Company company, CompanyUser companyUser) {
         FsUser user = new FsUser();
-        user.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
+        user.setStatus(1);
         user.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
         user.setCreateTime(new Date());
         if (param.getAuthType() == 1 && phoneNoInfo != null) {