diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java
index e9d67504..94e2f118 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java
@@ -17,6 +17,7 @@ import com.zdxt.enforcementcode.domain.EnterpriseUser;
import com.zdxt.enforcementcode.domain.EnterpriseUserRef;
import com.zdxt.enforcementcode.domain.bo.QrCodeGenerateHistoryBo;
import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo;
+import com.zdxt.enforcementcode.helper.QrCodeHelper;
import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper;
import com.zdxt.enforcementcode.mapper.EnterpriseUserMapper;
import com.zdxt.enforcementcode.mapper.EnterpriseUserRefMapper;
@@ -454,7 +455,13 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
enterpriseInformation.getEnterpriseNumber(), enterpriseInformation.getId());
/**生成二维码**/
- qrCodeGenerate(enterpriseInformation);
+ try{
+ QrCodeHelper.generateBlueWithLogoAndSave(enterpriseInformation.getSalt(), "zfjd", enterpriseInformation.getId(),
+ enterpriseInformation.getEnterpriseNumber(), "app.enterprise", new Date(), "", "登记");
+// qrCodeGenerate(enterpriseInformation);
+ } catch (Exception e) {
+ log.error("生成二维码失败",e.getMessage());
+ }
return enterpriseInformation;
}
}
@@ -574,8 +581,8 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
userInfo.put("userName", "测试用户");
userInfo.put("phone", IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, "13800138000"));
- userInfo.put("corpCid", "91440300769156389U");
- userInfo.put("corpName", "新粤云(深圳)信息技术有限公司");
+ userInfo.put("corpCid", "91440300662678582M");
+ userInfo.put("corpName", "深圳农牧美益肉业有限公司");
userInfo.put("companyOrgType", "有限责任公司");
userInfo.put("establishDate", "2010-01-15");
userInfo.put("businessScope", "安防产品、电子产品的技术开发与销售;计算机软件的技术开发;计算机系统集成;国内贸易(不含专营、专控、专卖商品及限制项目);汽车购销。(法律、行政法规、国务院决定禁止的项目除外,限制的项目须取得许可后方可经营)信息技术咨询服务。(除依法须经批准的项目外,凭营业执照依法自主开展经营活动)");
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
index 806c7404..07372087 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
@@ -218,6 +218,10 @@
AND enterprise_number = #{bo.enterpriseNumber}
+
+
+ AND is_submit = #{bo.isSubmit}
+