Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysUserTsignDao.java

@@ -5,5 +5,10 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface SysUserTsignDao extends BaseDAO<Integer, SysUserTsign> {
 
-	
+	/**
+	 * 根据证件号码查询
+	 * @param cardNo
+	 * @return
+	 */
+	SysUserTsign queryByCardNo(String cardNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserTsign.java

@@ -18,17 +18,23 @@ public class SysUserTsign {
 	/** 电子印章数据 */
 	private String sealData;
 
+	private String name;
+
+	private String cardNo;
+
 	/**  */
 	private java.util.Date createTime = new Date();
-	
+
 	public SysUserTsign() {
 		// TODO Auto-generated constructor stub
 	}
 
-	public SysUserTsign(Integer userId, String accountId, String sealData) {
+	public SysUserTsign(Integer userId, String accountId, String sealData, String name, String cardNo) {
 		this.userId = userId;
 		this.accountId = accountId;
 		this.sealData = sealData;
+		this.name = name;
+		this.cardNo = cardNo;
 	}
 
 	public void setUserId(Integer userId) {
@@ -55,6 +61,22 @@ public class SysUserTsign {
 		return this.sealData;
 	}
 
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCardNo() {
+		return cardNo;
+	}
+
+	public void setCardNo(String cardNo) {
+		this.cardNo = cardNo;
+	}
+
 	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/SysUserTsignService.java

@@ -5,4 +5,10 @@ import com.ym.mec.common.service.BaseService;
 
 public interface SysUserTsignService extends BaseService<Integer, SysUserTsign> {
 
+	/**
+	 * 根据证件号码查询
+	 * @param cardNo
+	 * @return
+	 */
+	SysUserTsign queryByCardNo(String cardNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -12,6 +12,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -51,7 +52,7 @@ import com.ym.mec.util.money.MoneyUtil;
 import com.ym.mec.util.pdf.PDFUtil;
 
 @Service
-public class ContractServiceImpl implements ContractService {
+public class ContractServiceImpl implements ContractService, InitializingBean {
 
 	@Autowired
 	private SysUserTsignService sysUserTsignService;
@@ -73,7 +74,7 @@ public class ContractServiceImpl implements ContractService {
 
 	@Autowired
 	private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
-	
+
 	@Autowired
 	private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
 
@@ -94,7 +95,7 @@ public class ContractServiceImpl implements ContractService {
 
 	@Autowired
 	private GoodsService goodsService;
-	
+
 	@Autowired
 	private MusicGroupService musicGroupService;
 
@@ -104,6 +105,35 @@ public class ContractServiceImpl implements ContractService {
 	private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
 
 	@Override
+	public void afterPropertiesSet() throws Exception {
+		// 注册企业账户
+		String orgName = "武汉长乐长风乐器销售有限公司";
+		String organCode = "91420106333619290A";
+
+		SysUserTsign sysUserTsign = sysUserTsignService.queryByCardNo(organCode);
+
+		if (sysUserTsign == null) {
+
+			String accountId = eSealPlugin.createOrganAccount(orgName, organCode);
+
+			if (StringUtils.isBlank(accountId)) {
+				throw new BizException("创建企业电子存证账户失败");
+			}
+
+			String sealData = eSealPlugin.createOrganSeal(accountId, "", "");
+
+			if (StringUtils.isBlank(sealData)) {
+				throw new BizException("创建电子存证印章失败");
+			}
+
+			sysUserTsign = new SysUserTsign(-1, accountId, sealData, orgName, organCode);
+
+			sysUserTsignService.insert(sysUserTsign);
+
+		}
+	}
+
+	@Override
 	public SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo) {
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
@@ -116,13 +146,13 @@ public class ContractServiceImpl implements ContractService {
 				throw new BizException("创建电子存证账户失败");
 			}
 
-			String sealData = eSealPlugin.createSeal(accountId);
+			String sealData = eSealPlugin.createUserSeal(accountId);
 
 			if (StringUtils.isBlank(sealData)) {
 				throw new BizException("创建电子存证印章失败");
 			}
 
-			sysUserTsign = new SysUserTsign(userId, accountId, sealData);
+			sysUserTsign = new SysUserTsign(userId, accountId, sealData, realName, idCardNo);
 
 			sysUserTsignService.insert(sysUserTsign);
 
@@ -279,16 +309,16 @@ public class ContractServiceImpl implements ContractService {
 		if (calenders == null || calenders.size() == 0) {
 			params.put("paymentcalender", "一次性");
 		} else {
-			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining(",")));
+			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")));
 		}
-		
+
 		params.put("isShowVisualSeal", false);
-		
+
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
-		if(musicGroup == null){
+		if (musicGroup == null) {
 			throw new BizException("乐团信息没找到");
 		}
-		
+
 		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "courses.ftl", srcFile);
@@ -369,16 +399,16 @@ public class ContractServiceImpl implements ContractService {
 		if (calenders == null || calenders.size() == 0) {
 			params.put("paymentcalender", "一次性");
 		} else {
-			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining(",")));
+			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")));
 		}
-		
+
 		params.put("isShowVisualSeal", true);
-		
+
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
-		if(musicGroup == null){
+		if (musicGroup == null) {
 			throw new BizException("乐团信息没找到");
 		}
-		
+
 		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "courses.ftl", srcFile);
@@ -437,9 +467,9 @@ public class ContractServiceImpl implements ContractService {
 
 		// 收费形式
 		params.put("paymentcalender", "一次性");
-		
+
 		params.put("isShowVisualSeal", false);
-		
+
 		params.put("ownershipType", "OWN");
 
 		templateEngine.render(params, "courses.ftl", srcFile);
@@ -505,9 +535,9 @@ public class ContractServiceImpl implements ContractService {
 
 		// 收费形式
 		params.put("paymentcalender", "一次性");
-		
+
 		params.put("isShowVisualSeal", true);
-		
+
 		params.put("ownershipType", "OWN");
 
 		templateEngine.render(params, "courses.ftl", srcFile);
@@ -569,14 +599,14 @@ public class ContractServiceImpl implements ContractService {
 		}
 		params.put("depositFee", musicGroupSubjectPlan.getDepositFee().doubleValue());
 		params.put("depositFeeFmt", MoneyUtil.toChinese(musicGroupSubjectPlan.getDepositFee().toString()));
-		
+
 		params.put("isShowVisualSeal", false);
-		
+
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
-		if(musicGroup == null){
+		if (musicGroup == null) {
 			throw new BizException("乐团信息没找到");
 		}
-		
+
 		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "goods.ftl", srcFile);
@@ -646,14 +676,14 @@ public class ContractServiceImpl implements ContractService {
 		}
 		params.put("depositFee", musicGroupSubjectPlan.getDepositFee().doubleValue());
 		params.put("depositFeeFmt", MoneyUtil.toChinese(musicGroupSubjectPlan.getDepositFee().toString()));
-		
+
 		params.put("isShowVisualSeal", true);
-		
+
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
-		if(musicGroup == null){
+		if (musicGroup == null) {
 			throw new BizException("乐团信息没找到");
 		}
-		
+
 		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "goods.ftl", srcFile);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -118,18 +118,20 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentRegistration == null) {
             throw new Exception("学员信息不存在");
         }
-        //当前专业报名人数减一
-        musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, studentRegistration.getActualSubjectId(), -1);
         //批量调剂（未缴费学员）
         int i = studentRegistrationDao.batchUpdateSubject(userId, subId, musicGroupId);
-        //修改专业已报名人数
-        musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, subId, 1);
-        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-        Set<Integer> roleIds = new HashSet<>(2);
-        roleIds.add(SysUserRole.SECTION_MANAGER);
-        roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds), MessageTypeEnum.BACKSTAGE_STUDENT_SUBJECT_CHANGE, "", musicGroup.getName());
-        return studentRegistrationDao.batchUpdateSubject(userId, subId, musicGroupId);
+        if(i > 0){
+            //当前专业报名人数减一
+            musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, studentRegistration.getActualSubjectId(), -1);
+            //修改专业已报名人数
+            musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, subId, 1);
+            MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+            Set<Integer> roleIds = new HashSet<>(2);
+            roleIds.add(SysUserRole.SECTION_MANAGER);
+            roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
+            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds), MessageTypeEnum.BACKSTAGE_STUDENT_SUBJECT_CHANGE, "", musicGroup.getName());
+        }
+        return i;
     }
 
     @Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysUserTsignServiceImpl.java

@@ -19,5 +19,10 @@ public class SysUserTsignServiceImpl extends BaseServiceImpl<Integer, SysUserTsi
 	public BaseDAO<Integer, SysUserTsign> getDAO() {
 		return sysUserTsignDao;
 	}
+
+	@Override
+	public SysUserTsign queryByCardNo(String cardNo) {
+		return sysUserTsignDao.queryByCardNo(cardNo);
+	}
 	
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupDefaultClassesCycleServiceImpl.java

@@ -1,19 +1,19 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesCycleDao;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
 import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 @Service
 public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Integer, VipGroupDefaultClassesCycle>  implements VipGroupDefaultClassesCycleService {
@@ -28,9 +28,6 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 
 	@Override
 	public long insert(VipGroupDefaultClassesCycle bean) {
-		if(Objects.isNull(bean.getOrganId())){
-			throw new BizException("请指定部门");
-		}
 
 		if(vipGroupDefaultClassesCycleDao.countAll()<=0){
 			bean.setMinClassTimes(0);

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -331,7 +331,7 @@
 
     <update id="batchUpdateSubject">
         UPDATE student_registration SET actual_subject_id_ = #{subId},update_time_ = now()
-        WHERE user_id_ = #{userId} AND payment_status_ = 0 AND music_group_id_ = #{musicGroupId}
+        WHERE user_id_ = #{userId} AND payment_status_ != 2 AND music_group_id_ = #{musicGroupId}
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">

mec-biz/src/main/resources/config/mybatis/SysUserTsignMapper.xml

@@ -10,6 +10,8 @@
 		<result column="user_id_" property="userId" />
 		<result column="account_id_" property="accountId" />
 		<result column="seal_data_" property="sealData" />
+		<result column="name_" property="name" />
+		<result column="card_no_" property="cardNo" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
 	
@@ -30,25 +32,31 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_tsign (user_id_,account_id_,seal_data_,create_time_) VALUES(#{userId},#{accountId},#{sealData},#{createTime})
+		INSERT INTO sys_user_tsign (user_id_,account_id_,seal_data_,name_,card_no_,create_time_) VALUES(#{userId},#{accountId},#{sealData},#{name},#{cardNo},now())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysUserTsign">
 		UPDATE sys_user_tsign <set>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="accountId != null">
-account_id_ = #{accountId},
-</if>
-<if test="sealData != null">
-seal_data_ = #{sealData},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE user_id_ = #{userId} 
+		<if test="userId != null">
+		user_id_ = #{userId},
+		</if>
+		<if test="accountId != null">
+		account_id_ = #{accountId},
+		</if>
+		<if test="sealData != null">
+		seal_data_ = #{sealData},
+		</if>
+		<if test="name != null">
+		name_ = #{name},
+		</if>
+		<if test="cardNo != null">
+		card_no_ = #{cardNo},
+		</if>
+		<if test="createTime != null">
+		create_time_ = #{createTime},
+		</if>
+		</set> WHERE user_id_ = #{userId} 
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -65,4 +73,8 @@ create_time_ = #{createTime},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_user_tsign
 	</select>
+	
+	<select id="queryByCardNo" resultMap="SysUserTsign">
+		SELECT * FROM sys_user_tsign where card_no_ = #{cardNo}
+	</select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/VipGroupCategoryMapper.xml

@@ -25,14 +25,14 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupCategory">
 		SELECT vgc.* FROM vip_group_category vgc
-		WHERE vgc.del_flag_=0
+		WHERE vgc.del_flag_!= 1
 		ORDER BY id_
 	</select>
 
 	<select id="findAllByOrgan" resultMap="VipGroupCategory">
 		SELECT vgc.*,vgdcup.online_classes_unit_price_,vgdcup.offline_classes_unit_price_ FROM vip_group_category vgc
 		LEFT JOIN vip_group_default_classes_unit_price_ vgdcup ON vgc.id_=vgdcup.vip_group_category_id_
-		WHERE vgc.del_flag_=0
+		WHERE vgc.del_flag_!= 1
 		AND FIND_IN_SET(vgdcup.organ_id_,#{organId})
 		ORDER BY id_
 	</select>
@@ -99,16 +99,15 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupCategory"
 		parameterType="map">
-		SELECT * FROM vip_group_category ORDER BY id_
+		SELECT * FROM vip_group_category where del_flag_ != 1 ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		vip_group_category
+		SELECT COUNT(*) FROM vip_group_category where del_flag_ != 1
 	</select>
 	<select id="findConditionCategorys" resultType="com.ym.mec.biz.dal.dto.ConditionDto">
-      	select id_ id,name_ `name` from vip_group_category where del_flag_ = 0
+      	select id_ id,name_ `name` from vip_group_category where del_flag_ != 1
     </select>
 </mapper>

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -3,10 +3,12 @@ package com.ym.mec.common.service.impl;
 import com.google.common.base.Strings;
 import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.service.IdGeneratorService;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/ESealPlugin.java

@@ -20,11 +20,20 @@ public interface ESealPlugin {
 	public String createOrganAccount(String orgName, String organCode);
 
 	/**
-	 * 创建印章
+	 * 创建个人印章
 	 * @param accountId 账户唯一标识
 	 * @return 电子印章数据
 	 */
-	public String createSeal(String accountId);
+	public String createUserSeal(String accountId);
+
+	/**
+	 * 创建企业印章
+	 * @param accountId 账户唯一标识
+	 * @param hText 生成印章中的横向文内容
+	 * @param qText 生成印章中的下弦文内容
+	 * @return 电子印章数据
+	 */
+	public String createOrganSeal(String accountId, String hText, String qText);
 
 	/**
 	 * 平台自身PDF摘要签署（印章标识）

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -15,6 +15,7 @@ import com.timevale.esign.sdk.tech.bean.result.AddSealResult;
 import com.timevale.esign.sdk.tech.bean.result.FileDigestSignResult;
 import com.timevale.esign.sdk.tech.bean.result.GetAccountProfileResult;
 import com.timevale.esign.sdk.tech.bean.result.Result;
+import com.timevale.esign.sdk.tech.bean.seal.OrganizeTemplateType;
 import com.timevale.esign.sdk.tech.bean.seal.PersonTemplateType;
 import com.timevale.esign.sdk.tech.bean.seal.SealColor;
 import com.timevale.esign.sdk.tech.impl.constants.LegalAreaType;
@@ -89,7 +90,7 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		AddAccountResult result = service.addAccount(personbean);
 		if (result.getErrCode() == 0) {
 			return result.getAccountId();
-		}else if(result.getErrCode() == 1500012){
+		} else if (result.getErrCode() == 1500012) {
 			return queryAccountIdByIdNo(idcard);
 		}
 		throw new ThirdpartyException(result.getMsg());
@@ -121,19 +122,29 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 	 * @param accountId e签宝账户唯一标识
 	 * @return 电子印章数据
 	 */
-	public String createSeal(String accountId) {
-		// 创建模板类型
-		PersonTemplateType templateType = PersonTemplateType.RECTANGLE;
+	public String createUserSeal(String accountId) {
 		// 生成模板印章的颜色
-		SealColor color = SealColor.BLUE;
+		SealColor color = SealColor.RED;
 		SealService service = serviceClient.sealService();
-		AddSealResult result = service.addTemplateSeal(accountId, templateType, color);
+		AddSealResult result = service.addTemplateSeal(accountId, PersonTemplateType.RECTANGLE, color);
 		if (0 == result.getErrCode()) {
 			return result.getSealData();
 		}
 		throw new ThirdpartyException("个人模板印章接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
 	}
 
+	@Override
+	public String createOrganSeal(String accountId, String hText, String qText) {
+		// 生成模板印章的颜色
+		SealColor color = SealColor.RED;
+		SealService service = serviceClient.sealService();
+		AddSealResult result = service.addTemplateSeal(accountId, OrganizeTemplateType.STAR, color, hText, qText);
+		if (0 == result.getErrCode()) {
+			return result.getSealData();
+		}
+		throw new ThirdpartyException("企业模板印章接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
+	}
+
 	/**
 	 * 平台自身PDF摘要签署（印章标识）
 	 * @param srcPdfPath 源文件
@@ -230,20 +241,20 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		}
 		throw new ThirdpartyException("平台用户PDF摘要签署接口调用失败" + result.getErrCode() + "msg=" + result.getMsg());
 	}
-	
-	private String queryAccountIdByIdNo(String idcardNo){
-		
+
+	private String queryAccountIdByIdNo(String idcardNo) {
+
 		AccountService service = serviceClient.accountService();
-		
+
 		GetAccountProfileResult result = service.getAccountInfoByIdNo(idcardNo, LicenseQueryType.MAINLAND);
-		
-		if(result != null){
+
+		if (result != null) {
 			AccountProfile accountProfile = result.getAccountInfo();
-			if(accountProfile != null){
+			if (accountProfile != null) {
 				return accountProfile.getAccountUid();
 			}
 		}
-		
+
 		return null;
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupCategoryController.java

@@ -1,15 +1,10 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.entity.Employee;
-import com.ym.mec.biz.dal.entity.VipGroupCategory;
-import com.ym.mec.biz.service.VipGroupCategoryService;
-import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
+
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,9 +12,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.VipGroupCategory;
+import com.ym.mec.biz.service.VipGroupCategoryService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
 
 @Api(tags = "vip课类别")
 @RequestMapping("vipGroupCategory")
@@ -43,25 +41,8 @@ public class VipGroupCategoryController extends BaseController {
 	@ApiOperation("全查询")
 	@GetMapping(value = "/queryAll")
     @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/queryAll')")
-	public Object queryAll(String organId) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
-		if (!sysUser.getIsSuperAdmin()) {
-			Employee employee = employeeDao.get(sysUser.getId());
-			if (StringUtils.isEmpty(organId)) {
-				organId = employee.getOrganIdList();
-			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
-				return failed("用户所在分部异常");
-			}else {
-				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organId.split(",")))){
-					return failed("非法请求");
-				}
-			}
-		}
-		return succeed(vipGroupCategoryService.findAllByOrgan(organId));
+	public Object queryAll(QueryInfo queryInfo) {
+		return succeed(vipGroupCategoryService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("获取教师课酬")