资质bug修改

src/main/java/com/glxp/api/controller/auth/LoginController.java

@@ -59,6 +59,8 @@ public class LoginController extends BaseController {
     private CompanyService companyService;
     @Resource
     private AuthLicenseDao authLicenseDao;
+    @Resource
+    private UserRegisterService userRegisterService;
 
 
     /**
@@ -76,7 +78,12 @@ public class LoginController extends BaseController {
 
         AuthAdmin authAdmin = authAdminService.findByUserName(loginRequest.getUsername());
         if (authAdmin == null) {
-            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
+           UserRegisterEntity userRegisterEntity=userRegisterService.selectByUserName(loginRequest.getUsername());
+           if(userRegisterEntity!=null){
+               throw new JsonException(ResultEnum.DATA_NOT, "该账号未通过审核！");
+           }else {
+               throw new JsonException(ResultEnum.DATA_NOT, "该账号未注册！");
+           }
         }
 
         if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -100,7 +100,7 @@ public class SupCertController {
         if (postSelCertRequest.getCertType() == null) {
             return ResultVOUtils.error(500, "参数错误！");
         }
-        if (postSelCertRequest.getManufacturerIdFk() == null) {
+
             String errMsg = "";
             ArrayList<String> list = new ArrayList<>();
             int i = postSelCertRequest.getSupCertSetEntities().size();
@@ -120,7 +120,7 @@ public class SupCertController {
                     }
                 }
             }
-        }
+
 
 
         for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {

src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java

@@ -14,7 +14,7 @@ public interface UserRegisterDao {
 
     UserRegisterEntity selectByCname(String cName);
 
-
+    UserRegisterEntity selectByUserName(String userName);
 
     boolean insertUserRegister(UserRegisterEntity userRegisterEntity);
 

src/main/java/com/glxp/api/service/auth/UserRegisterService.java

@@ -17,6 +17,8 @@ public interface UserRegisterService {
 
     boolean deleteById(Long id);
 
+    UserRegisterEntity selectByUserName(String userName);
+
     boolean deleteByMobile(String phone,Integer checkType);
 
     UserRegisterEntity selectById(Integer id);

src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java

@@ -50,6 +50,11 @@ public class UserRegisterServiceImpl implements UserRegisterService {
         return userRegisterDao.deleteById(id);
     }
 
+    @Override
+    public UserRegisterEntity selectByUserName(String userName) {
+        return userRegisterDao.selectByUserName(userName);
+    }
+
     @Override
     public boolean deleteByMobile(String phone, Integer checkType) {
         return userRegisterDao.deleteByMobile(phone,checkType);

src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml

@@ -24,6 +24,13 @@
             where companyName=#{cName}
     </select>
 
+    <select id="selectByUserName" parameterType="java.lang.String"
+            resultType="com.glxp.api.entity.auth.UserRegisterEntity">
+        SELECT *
+        FROM user_register
+        where userName=#{userName}
+    </select>
+
 
 
     <insert id="insertUserRegister" keyProperty="id" parameterType="com.glxp.api.entity.auth.UserRegisterEntity">

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -89,7 +89,7 @@
                 AND orderType = #{orderType}
             </if>
 
-            <if test="supInoivceSearch != null">
+            <if test="supInoivceSearch != null and invoiceActions1 !=null or invoiceActions2 !=null">
                 AND ((`action` in
                 <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                     #{item}