|
|
@@ -182,9 +182,11 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
|
|
|
createNotice(user, oi.getAuditStatus());
|
|
|
}
|
|
|
if (IdentityAuditStatus.PASSED.getCode().equals(oi.getAuditStatus())) {
|
|
|
- if (UserLevel.GENERAL.getCode().equals(level)) {
|
|
|
- user.setLvl(UserLevel.CERTIFIED.getCode());
|
|
|
- }
|
|
|
+ /*
|
|
|
+ * if (UserLevel.GENERAL.getCode().equals(level)) {
|
|
|
+ * user.setLvl(UserLevel.CERTIFIED.getCode()); }
|
|
|
+ */
|
|
|
+ user.setLvl(UserLevel.CERTIFIED.getCode());
|
|
|
user.setAid(aid);
|
|
|
user.setMid(mid);
|
|
|
userMapper.updateByPrimaryKeySelective(user);
|
|
|
@@ -231,10 +233,10 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<OrgSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
|
|
|
- Integer area, Integer pNo, Integer pSize) {
|
|
|
+ public Pagination<OrgSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province,
|
|
|
+ Integer city, Integer area, Integer pNo, Integer pSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isNotBlank(name)) {
|
|
|
params.put("name", name);
|
|
|
}
|
|
|
@@ -250,16 +252,15 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
|
|
|
if (null != province) {
|
|
|
params.put("province", province);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (null != city) {
|
|
|
params.put("city", city);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (null != area) {
|
|
|
params.put("area", area);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|