新增公司消息

src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java

@@ -81,7 +81,7 @@ public class CompanyManagementController {
     @RequestMapping(value = "/detail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<CompanyResVo> getDetail(@RequestBody CompanyGetReqVo reqVo){
         CheckerHelper.newInstance()
-                .notBlankCheck("companyId",reqVo.getId())
+                .notBlankCheck("id",reqVo.getId())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.getDetail(reqVo));
     }
@@ -108,7 +108,7 @@ public class CompanyManagementController {
     public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
-                .notBlankCheck("merchantId", reqVo.getMerchantId())
+//                .notBlankCheck("merchantId", reqVo.getMerchantId())
                 .notBlankCheck("select",reqVo.getSelect())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));

src/main/java/com/pangding/web/authority/dao/impl/CompanyMsgDaoImpl.java

@@ -23,10 +23,10 @@ public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
 
         register(CompanyMsgVo.class);
 
-        table.add(QUERY_LIST_PAGE, "select m.*,cm.company_id,cm.type,cm.merchant_id " +
+        table.add(QUERY_LIST_PAGE, "select m.*,cm.msg_id,cm.company_id,cm.type,cm.merchant_id " +
                 "from pd_company_msg cm left join pd_msg m on cm.msg_id = m.id where 1=1 ")
                 .add("companyId", "and cm.company_id = ? ")
-                .add("", " AND cm.merchantId = ? ")
+                .add("merchantId", " AND cm.merchant_id = ? ")
                 .add("type", "and cm.type = ? ");
 
     }

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -21,6 +21,7 @@ import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.pangding.web.vo.system.req.company.CompanyExtendReqVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.res.authority.AuthorityResVo;
+import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -354,7 +355,7 @@ public class UserServiceImpl implements UserService {
             // 验证邀请码是否正确
             CompanyExtendReqVo companyReqVo = new CompanyExtendReqVo();
             companyReqVo.setInvitationCode(saveUserReqVo.getInvitationCode());
-            CompanyExtendReqVo companyResVo = companyDao.load(companyReqVo, CompanyExtendReqVo.class);
+            CompanyExtendResVo companyResVo = companyExtendDao.load(companyReqVo, CompanyExtendResVo.class);
             if (StringHelper.isEmpty(companyResVo)) {
                 // 邀请码不正确
                 return ResponseResult.error("99", "邀请码错误");