commit

src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java

@@ -175,7 +175,7 @@ public class ActivityUnionManageController {
         tissue.getCover();
         activityTissueService.insertWith(tissue, "tissuePersonList");
         activitySchoolService.dao().insert(tissue.getGoods());
-        if (tissue.getIsPushHome()!=0) {
+        if (tissue.getIsEnrollSystem()) {
             Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
             activityTissueService.dao().insertOrUpdate(sysHomeActivity);
         }
@@ -311,7 +311,7 @@ public class ActivityUnionManageController {
     public Object activityStatusChange(String id, String isDisabled) {
         activityTissueService.update(Chain.make("isDisabled", "1".equals(isDisabled)), Cnd.where("id", "=", id));
         activityTissueService.dao().update(Sys_home_activity.class,
-                Chain.make("enable", isDisabled),
+                Chain.make("enable", "1".equals(isDisabled)),
                 Cnd.where("id", "=", id));
         return null;
     }

src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java

@@ -217,7 +217,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
     @Column
     @Comment("是否报名系统")
     @ColDefine(type = ColType.BOOLEAN)
-    private boolean isEnrollSystem;
+    private Boolean isEnrollSystem;
 
     @Many(field = "tissueId")
     private List<ActivityTissuePerson> tissuePersonList;

src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java

@@ -133,7 +133,7 @@ public class ActivityTissueServiceImpl extends ViServiceImpl<ActivityTissue> imp
             v.setReid(tissue.getId());
         });
         tissuePersonService.dao().insert(tissue.getGoods());
-        if (tissue.getIsPushHome()!=0) {
+        if (tissue.getIsEnrollSystem()) {
             Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
             dao().insertOrUpdate(sysHomeActivity);
         } else {

src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java

@@ -497,7 +497,7 @@ public class UnionActivityRegisterController {
     @RequiresAuthentication
     public Object doSingleCancelRegister(String activityId, String applyUserId, String id) {
         ActivityTissue tissue = simpleService.dao().fetch(ActivityTissue.class, activityId);
-        if (!tissue.isEnrollSystem()) {
+        if (!tissue.getIsEnrollSystem()) {
             simpleService.dao().delete(ActivityTissuePerson.class, id);
             return Result.success().addMsg("取消成功！");
         }

src/main/java/io/v/nutz/zhgh/trainSignUp/service/impl/TrainSignUpActivityServiceImpl.java

@@ -5,6 +5,7 @@ import cn.wizzer.framework.page.Pagination;
 import io.v.nutz.base.query.PageForm;
 import io.v.nutz.base.service.impl.ViServiceImpl;
 import io.v.nutz.base.utils.Vi;
+import io.v.nutz.sys.models.Sys_home_activity;
 import io.v.nutz.sys.models.Sys_user;
 import io.v.nutz.web.commons.utils.ShiroUtil;
 import io.v.nutz.zhgh.data.constant.ConditionalOperational;
@@ -107,6 +108,11 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl<TrainSignUpAct
             v.setActivityId(activity.getId());
             dao().insert(v);
         });
+
+        if (!activity.isDisabled()) {
+            Sys_home_activity sysHomeActivity = activity.covertToSysHomeActivity();
+            dao().insertOrUpdate(sysHomeActivity);
+        }
     }
 
     @Override
@@ -219,6 +225,12 @@ public class TrainSignUpActivityServiceImpl extends ViServiceImpl<TrainSignUpAct
             dao().update("train_sign_up_user_course", chain, cnd);
         });
 
+        if (!activity.isDisabled()) {
+            Sys_home_activity sysHomeActivity = activity.covertToSysHomeActivity();
+            dao().insertOrUpdate(sysHomeActivity);
+        } else {
+            dao().delete(Sys_home_activity.class, activity.getId());
+        }
     }
 
     @Override