增加工作流自动同步开关，默认关闭：activiti.isSynActivitiIndetity=false

farkguidao · Oct 30, 2014 · a70119d · a70119d
1 parent 9a3af7e
commit a70119d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/src/main/java/com/thinkgem/jeesite/common/config/Global.java b/src/main/java/com/thinkgem/jeesite/common/config/Global.java
@@ -71,6 +71,14 @@ public static Boolean isDemoMode() {
 		String dm = getConfig("demoMode");
 		return "true".equals(dm) || "1".equals(dm);
 	}
+
+	/**
+	 * 在修改系统用户和角色时是否同步到Activiti
+	 */
+	public static Boolean isSynActivitiIndetity() {
+		String dm = getConfig("activiti.isSynActivitiIndetity");
+		return "true".equals(dm) || "1".equals(dm);
+	}
 
 	/**
 	 * 获取CKFinder上传文件的根目录

diff --git a/src/main/java/com/thinkgem/jeesite/modules/sys/service/SystemService.java b/src/main/java/com/thinkgem/jeesite/modules/sys/service/SystemService.java
@@ -21,6 +21,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.google.common.collect.Maps;
+import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.security.Digests;
 import com.thinkgem.jeesite.common.service.BaseService;
@@ -310,6 +311,9 @@ public void synToActiviti()  {
 	}
 
 	private void saveActiviti(Role role) {
+		if (!Global.isSynActivitiIndetity()){
+			return;
+		}
 		try{
 			if(role!=null) {
 				List<User> userList = roleDao.get(role.getId()).getUserList();
@@ -332,9 +336,11 @@ private void saveActiviti(Role role) {
 			e.printStackTrace();
 		}
 	}
-
 
 	private void deleteActiviti(Role role) {
+		if (!Global.isSynActivitiIndetity()){
+			return;
+		}
 		try{
 			if(role!=null) {
 				List<User> userList = roleDao.get(role.getId()).getUserList();
@@ -351,6 +357,9 @@ private void deleteActiviti(Role role) {
 	}
 
 	private void saveActiviti(User user) {
+		if (!Global.isSynActivitiIndetity()){
+			return;
+		}
 		try{
 			if(user!=null) {
 				String userId = ObjectUtils.toString(user.getId());
@@ -370,6 +379,9 @@ private void saveActiviti(User user) {
 	}
 
 	private void deleteActiviti(User user) {
+		if (!Global.isSynActivitiIndetity()){
+			return;
+		}
 		try{
 			if(user!=null) {
 				String userId = ObjectUtils.toString(user.getId());
@@ -381,6 +393,9 @@ private void deleteActiviti(User user) {
 	}
 
 	private void saveActiviti(Menu menu) {
+		if (!Global.isSynActivitiIndetity()){
+			return;
+		}
 		try{
 			if(menu!=null){
 				Group group = identityService.createGroupQuery().groupId(menu.getActivitiGroupId()).singleResult();
@@ -408,7 +423,11 @@ private void saveActiviti(Menu menu) {
 			e.printStackTrace();
 		}
 	}
+
 	private void deleteActiviti(String id) {
+		if (!Global.isSynActivitiIndetity()){
+			return;
+		}
 		try{
 			if(id!=null) {
 				Menu menu = menuDao.get(id);
@@ -431,6 +450,9 @@ private void deleteActiviti(String id) {
 
 	@SuppressWarnings("unchecked")
 	private void merge(User user,List<Menu> menuList) {
+		if (!Global.isSynActivitiIndetity()){
+			return;
+		}
 		try{
 			String userId = ObjectUtils.toString(user.getId());
 			List<Group> activitiGroupList = identityService.createGroupQuery().groupMember(userId).list();

diff --git a/src/main/resources/jeesite.properties b/src/main/resources/jeesite.properties
@@ -52,6 +52,9 @@ web.view.suffix=.jsp
 #max upload size. 10M=10*1024*1024(B)=10485760 bytes
 web.maxUploadSize=10485760
 
+#\u4fee\u6539\u7528\u6237\u673a\u6784\u65f6\u662f\u5426\u540c\u6b65activiti
+activiti.isSynActivitiIndetity=false
+
 #============================#
 #====== Global sttings ======#
 #============================#