调整

src/main/java/com/jeeplus/modules/sys/service/SysRoleActivityService.java

@@ -47,7 +47,8 @@ public class SysRoleActivityService extends CrudService<SysRoleActivityDao, SysR
 		SysRoleActivity sysRoleActivity = super.get(id);
 		String name=sysRoleActivity.getName();
 		User user = UserUtils.getUser();
-		if (!user.isAdmin()){
+//		if (!user.isAdmin()){
+		if (user.isAdmin()){
 			Office company = UserUtils.getSelectCompany();
 			Activity activity = new Activity();
 			sysRoleActivity.setName(sysRoleActivity.getEnname().replace(UserUtils.getRoleActivityEnname(company.getId(),user),""));

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -834,7 +834,7 @@ public class WorkFullManageController extends BaseController {
 		data.put("repType",list.get(0));
 		data.put("repYear",list.get(1));
 		data.put("repNum",list.get(2));
-		data.put("querySite","re.xgccpm.com/ccpm_query");
+		data.put("querySite","ccpm.xgccpm.com");
 
 		//生成二维码图片和doc文档 缓存文件的共用名称
 		String commonFileName = UUID.randomUUID().toString();

src/main/webapp/webpage/modules/act/actProcessRunningList.jsp

@@ -87,7 +87,8 @@
 							<td>
 								<a  href="javascript:openDialog('查看流程历史','${ctx}/act/task/trace/photo/${procIns.processDefinitionId}/${procIns.id}','1000px', '600px')">历史</a>
 								<shiro:hasPermission name="act:process:edit">
-									<a href="${ctx}/act/process/deleteProcIns?procInsId=${procIns.processInstanceId}&reason=" onclick="return promptx('作废原因',this.href);">作废</a>
+									<%--<a href="${ctx}/act/process/deleteProcIns?procInsId=${procIns.processInstanceId}&reason=" onclick="return promptx('作废原因',this.href);">作废</a>--%>
+									<a href="${ctx}/act/process/deleteProcIns?procInsId=${procIns.processInstanceId}&reason=1" >作废</a>
 								</shiro:hasPermission>&nbsp;
 							</td>
 						</tr>