Merge branch 'online1'

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

@@ -5,6 +5,7 @@ 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.SporadicChargeInfo;
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
 import com.ym.mec.biz.service.SporadicChargeInfoService;
 import com.ym.mec.common.controller.BaseController;
@@ -87,7 +88,7 @@ public class SporadicChargeInfoController extends BaseController {
 			}
 			sporadicChargeInfo.setOrganId(user.getOrganId());
 		}
-		if(sporadicChargeInfo.getChargeType().equals("6")){
+		if(sporadicChargeInfo.getChargeType().equals(SporadicChargeTypeEnum.LUCKY_BAG_ACTIVE)){
 			SporadicChargeInfo info = sporadicChargeInfoService.findByOrganIdAndType(sporadicChargeInfo.getOrganId(), sporadicChargeInfo.getChargeType().getCode());
 			if(info != null){
 				return failed("分部活动已存在，请勿重复创建");