git-svn-id: https://192.168.57.71/svn/jsgkj@489 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/DcsbService.java

@@ -14,7 +14,7 @@ public interface DcsbService extends BaseWorkFlowService {
 	public <S extends DcsbEntity> S save(S entity);
 
 	public <S extends DcsbEntity> S submit(S entity);
-
+	
 	DcsbEntity findOne(String id);
 
 	public Object selectCount(String sTime, String eTime);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbServiceImpl.java

@@ -45,6 +45,7 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 	@Override
 	public <S extends DcsbEntity> S submit(S entity) {
+
 		if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
@@ -103,18 +104,21 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 					String jyrId = entity.getSsjyr().getId();
 					UserEntity user = securityMgr.userService().findByssjyr(jyrId);
 					if (user != null) {
-						param.put(WorkFlowParam.AUDIT_USER, user.getId());
+						param.put(WorkFlowParam.AUDIT_USER, user.getId().toString());
+
 					}
 				}
 
 			}
-			param.put(WorkFlowParam.BUSINESS_KEY, entity.getId());
+			param.put(WorkFlowParam.BUSINESS_KEY, entity.getId().toString());
 			// 提交流程
 			create(param, variables);
 		}
 		return entity;
+
 	}
 
+
 	@Override
 	public boolean changeAudit(String shyj, DcsbEntity entity, boolean flag) {
 		Map<String, Object> variables = new HashMap<String, Object>();
@@ -214,4 +218,5 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 	public List<Object> dcsbtjbg2(String sTime, String eTime, String hwzldedl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid) {
 		return dao.dcsbtjbg2(sTime, eTime, hwzldedl, nwmid, szdid, szgkid, szgqid, jcgid);
 	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/webservice/DcsbWebService.java

@@ -28,6 +28,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xtframe.core.webService.AuthHandler;
 import com.xtframe.sec.code.entity.CodeEntity;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.PredicateModel;
@@ -174,7 +175,7 @@ public class DcsbWebService extends BaseWebCtl {
 		return list.getContent();
 	}
 
-	public boolean submit(DcsbEntity entity) {
+	public boolean submit(DcsbEntity entity,String userId) {
 		if (entity != null && entity.getSsjyr() != null && entity.getSsjyr().getId() != null) {
 			GkjyrEntity jyr = gkjyrService.findOne(entity.getSsjyr().getId());
 			if (jyr == null) {
@@ -187,6 +188,7 @@ public class DcsbWebService extends BaseWebCtl {
 			entity.setShzt("2402");
 		}
 		try {
+			AuthHandler.setCurrentUser(securityMgr.userService().findById(userId));
 			entity = dcsbService.submit(entity);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -200,6 +202,7 @@ public class DcsbWebService extends BaseWebCtl {
 		if (userEntity == null) {
 			return false;
 		}
+		AuthHandler.setCurrentUser(securityMgr.userService().findById(userId));
 		// 未签收的，需要先签收
 		if ((dcsbService.getTaskByUserAndBusKey(userEntity.getId().toString(), dcsbId) == null) && dcsbService.getCandidateTaskByUserAndBusKey(userEntity.getId().toString(), dcsbId) != null) {
 			dcsbService.claim(dcsbId, SecUtils.getCurrUser().getId().toString());

gkjsjy/trunk/src/com/xtframe/core/webService/AuthHandler.java

@@ -47,6 +47,12 @@ public class AuthHandler implements SOAPHandler<SOAPMessageContext> {
 		return userLocal.get();
 	}
 
+	public static void setCurrentUser(UserEntity ue){
+		if(userLocal.get() == null){
+			userLocal.set(ue);
+		}
+	}
+	
 	@Override
 	public boolean handleMessage(SOAPMessageContext context) {
 		Boolean outbound = (Boolean) context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);