diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index fd32337..7497142 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -161,12 +161,12 @@ * @param hasMine 是否包含本人,1包含, 0不包含 * @param roleTips 角色类型,例:leader,member */ - @FormUrlEncoded - @POST("/sys/mgr/simplelist") + @GET("/sys/mgr/simpleList") suspend fun obtainSubordinate( @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? + @Query("hasMine") hasMine: String?, + @Query("deptId") deptId: String?, + @Query("roleTips") roleTips: String? ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index fd32337..7497142 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -161,12 +161,12 @@ * @param hasMine 是否包含本人,1包含, 0不包含 * @param roleTips 角色类型,例:leader,member */ - @FormUrlEncoded - @POST("/sys/mgr/simplelist") + @GET("/sys/mgr/simpleList") suspend fun obtainSubordinate( @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? + @Query("hasMine") hasMine: String?, + @Query("deptId") deptId: String?, + @Query("roleTips") roleTips: String? ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 73e9801..7b97419 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -138,8 +138,8 @@ /** * 查找同一单位下的用户 */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) + suspend fun obtainSubordinate(hasMine: String?, deptId: String?, roleTips: String?): String { + return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, deptId, roleTips) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index fd32337..7497142 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -161,12 +161,12 @@ * @param hasMine 是否包含本人,1包含, 0不包含 * @param roleTips 角色类型,例:leader,member */ - @FormUrlEncoded - @POST("/sys/mgr/simplelist") + @GET("/sys/mgr/simpleList") suspend fun obtainSubordinate( @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? + @Query("hasMine") hasMine: String?, + @Query("deptId") deptId: String?, + @Query("roleTips") roleTips: String? ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 73e9801..7b97419 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -138,8 +138,8 @@ /** * 查找同一单位下的用户 */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) + suspend fun obtainSubordinate(hasMine: String?, deptId: String?, roleTips: String?): String { + return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, deptId, roleTips) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 16510b9..7b8539b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -211,7 +211,7 @@ } //转单 transferOrderButton.setOnClickListener { - userViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "", "leader,member") } userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index fd32337..7497142 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -161,12 +161,12 @@ * @param hasMine 是否包含本人,1包含, 0不包含 * @param roleTips 角色类型,例:leader,member */ - @FormUrlEncoded - @POST("/sys/mgr/simplelist") + @GET("/sys/mgr/simpleList") suspend fun obtainSubordinate( @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? + @Query("hasMine") hasMine: String?, + @Query("deptId") deptId: String?, + @Query("roleTips") roleTips: String? ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 73e9801..7b97419 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -138,8 +138,8 @@ /** * 查找同一单位下的用户 */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) + suspend fun obtainSubordinate(hasMine: String?, deptId: String?, roleTips: String?): String { + return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, deptId, roleTips) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 16510b9..7b8539b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -211,7 +211,7 @@ } //转单 transferOrderButton.setOnClickListener { - userViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "", "leader,member") } userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 4700479..ed045fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -159,7 +159,7 @@ //转单 transferOrderButton.setOnClickListener { - userViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "", "leader,member") } userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index fd32337..7497142 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -161,12 +161,12 @@ * @param hasMine 是否包含本人,1包含, 0不包含 * @param roleTips 角色类型,例:leader,member */ - @FormUrlEncoded - @POST("/sys/mgr/simplelist") + @GET("/sys/mgr/simpleList") suspend fun obtainSubordinate( @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? + @Query("hasMine") hasMine: String?, + @Query("deptId") deptId: String?, + @Query("roleTips") roleTips: String? ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 73e9801..7b97419 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -138,8 +138,8 @@ /** * 查找同一单位下的用户 */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) + suspend fun obtainSubordinate(hasMine: String?, deptId: String?, roleTips: String?): String { + return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, deptId, roleTips) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 16510b9..7b8539b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -211,7 +211,7 @@ } //转单 transferOrderButton.setOnClickListener { - userViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "", "leader,member") } userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 4700479..ed045fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -159,7 +159,7 @@ //转单 transferOrderButton.setOnClickListener { - userViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "", "leader,member") } userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index e6cc646..a80f913 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -27,8 +27,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { @@ -161,8 +161,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) searchOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index fd32337..7497142 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -161,12 +161,12 @@ * @param hasMine 是否包含本人,1包含, 0不包含 * @param roleTips 角色类型,例:leader,member */ - @FormUrlEncoded - @POST("/sys/mgr/simplelist") + @GET("/sys/mgr/simpleList") suspend fun obtainSubordinate( @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? + @Query("hasMine") hasMine: String?, + @Query("deptId") deptId: String?, + @Query("roleTips") roleTips: String? ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 73e9801..7b97419 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -138,8 +138,8 @@ /** * 查找同一单位下的用户 */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) + suspend fun obtainSubordinate(hasMine: String?, deptId: String?, roleTips: String?): String { + return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, deptId, roleTips) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 16510b9..7b8539b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -211,7 +211,7 @@ } //转单 transferOrderButton.setOnClickListener { - userViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "", "leader,member") } userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 4700479..ed045fe 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -159,7 +159,7 @@ //转单 transferOrderButton.setOnClickListener { - userViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "", "leader,member") } userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index e6cc646..a80f913 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -27,8 +27,8 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { @@ -161,8 +161,8 @@ paramObject.put("endTime", args[5]) paramObject.put("limit", LocaleConstant.PAGE_LIMIT) paramObject.put("offset", pageIndex) - val requestBody = RequestBody.create( - "application/json;charset=UTF-8".toMediaTypeOrNull(), paramObject.toString() + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() ) searchOrderViewModel.obtainSearchResult(requestBody) } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt index f63d899..fc6e18a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -47,8 +47,8 @@ /** * 转单下一级人员 * */ - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + fun obtainSubordinate(hasMine: String?, deptId: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, deptId, roleTips) val responseCode = response.separateResponseCode() if (responseCode == 200) { subordinateModel.value = gson.fromJson(